Index: trunk/epgdumpr2/epgdump.c =================================================================== --- trunk/epgdumpr2/epgdump.c (リビジョン 136) +++ trunk/epgdumpr2/epgdump.c (リビジョン 137) @@ -52,10 +52,41 @@ { "BS�吾����", "3007.ontvjapan.com", 16433, 4, 171}, { "BS���", "3008.ontvjapan.com", 16593, 4, 181}, - { "WOWOW", "3009.ontvjapan.com", 16432, 4, 191}, - { "WOWOW2", "3010.ontvjapan.com", 16432, 4, 192}, - { "WOWOW3", "3011.ontvjapan.com", 16432, 4, 193}, - { "�鴻��若�����潟���, "3012.ontvjapan.com", 16529, 4, 200}, +// { "WOWOW", "3009.ontvjapan.com", 16432, 4, 191}, +// { "WOWOW2", "3010.ontvjapan.com", 16432, 4, 192}, +// { "WOWOW3", "3011.ontvjapan.com", 16432, 4, 193}, + { "WOWOW����ゃ�", "3009.ontvjapan.com", 16432, 4, 191}, + { "WOWOW�����, "4192.epgdata.ontvjapan", 17488, 4, 192}, + { "WOWOW�激���, "4193.epgdata.ontvjapan", 17489, 4, 193}, +// { "�鴻��若�����潟���, "3012.ontvjapan.com", 16529, 4, 200}, + { "�鴻��若�����潟���", "3012.ontvjapan.com", 16529, 4, 200}, + { "�鴻��若�����潟���", "4201.epgdata.ontvjapan", 17520, 4, 201}, + { "�鴻��若�����潟���", "4202.epgdata.ontvjapan", 17520, 4, 202}, { "BS11", "3013.ontvjapan.com", 16528, 4, 211}, { "TwellV", "3014.ontvjapan.com", 16530, 4, 222}, + { "�冗�紊у�1", "4231.epgdata.ontvjapan", 18098, 4, 231}, + { "�冗�紊у�2", "4232.epgdata.ontvjapan", 18098, 4, 232}, + { "�冗�紊у�3", "4233.epgdata.ontvjapan", 18098, 4, 233}, + { "�違��若�����潟���, "4234.epgdata.ontvjapan", 18224, 4, 234}, + { "BS�≪�������", "1047.ontvjapan.com", 18033, 4, 236}, + { "FOX bs238", "4238.epgdata.ontvjapan", 18096, 4, 238}, + { "BS�鴻����鐚�, "4241.epgdata.ontvjapan", 18097, 4, 241}, + { "J SPORTS 1", "4242.epgdata.ontvjapan", 18225, 4, 242}, + { "J SPORTS 2", "4243.epgdata.ontvjapan", 18226, 4, 243}, + { "J SPORTS 3", "4244.epgdata.ontvjapan", 18257, 4, 244}, + { "J SPORTS 4", "4245.epgdata.ontvjapan", 18258, 4, 245}, + { "BS�c�����с�", "4251.epgdata.ontvjapan", 18288, 4, 251}, + { "IMAGICA BS", "4252.epgdata.ontvjapan", 18256, 4, 252}, + { "�ユ����絨������潟���, "4255.epgdata.ontvjapan", 18289, 4, 255}, + { "����冴��若�����潟���, "1090.ontvjapan.com", 18034, 4, 256}, + { "D-Life", "4258.epgdata.ontvjapan", 18290, 4, 258}, + { "NHK膩�������吾��鰹��延根鐚�, "4291.epgdata.ontvjapan", 17168, 4, 291}, + { "NHK����������с�鐚��篋��", "4292.epgdata.ontvjapan", 17168, 4, 292}, + { "�ユ������, "4294.epgdata.ontvjapan", 17169, 4, 294}, + { "��������, "4295.epgdata.ontvjapan", 17169, 4, 295}, + { "TBS�����, "4296.epgdata.ontvjapan", 17169, 4, 296}, + { "������篋�, "4297.epgdata.ontvjapan", 17169, 4, 297}, + { "��������, "4298.epgdata.ontvjapan", 17168, 4, 298}, + { "�冗�紊у������, "4531.epgdata.ontvjapan", 18098, 4, 531}, + { "WNI", "4910.ontvjapan.com", 16626, 4, 910}, }; @@ -66,6 +97,6 @@ static STATION csSta[] = { { "�鴻��種�鐔�����", "1002.ontvjapan.com", 24608, 6, 237}, - { "�ユ����絨��鐔��鐚�爾", "1086.ontvjapan.com", 24608, 6, 239},//��������SHD �� { "��������汐鐚ワ叱鐚�, "306ch.epgdata.ontvjapan", 24608, 6, 306}, - { "�激��������潟���, "1059.ontvjapan.com", 24704, 6, 55}, + { "�ユ����絨��鐔��鐚�爾", "1086.ontvjapan.com", 24608, 6, 239}, + { "��������汐鐚ワ叱鐚�, "306ch.epgdata.ontvjapan", 24608, 6, 306},//��������SHD �� { "�激��������潟���, "1059.ontvjapan.com", 24704, 6, 55}, { "�吟��激���, "1217.ontvjapan.com", 24736, 6, 228}, { "�鴻�����鰹示鐚わ�鐚��", "800ch.epgdata.ontvjapan", 24736, 6, 800}, @@ -73,11 +104,10 @@ { "�鴻�����鰹�鐚��", "802ch.epgdata.ontvjapan", 24736, 6, 802}, { "鐔�������, "100ch.epgdata.ontvjapan", 28736, 7, 100}, - { "�ゃ��帥�������鐚器雫", "194ch.epgdata.ontvjapan", 28736, 7, 194}, +// { "�ゃ��帥�������鐚器雫", "194ch.epgdata.ontvjapan", 28736, 7, 194},//綮�� 2010/9/16/ { "鐚��������鐚ワ竺鐚逸汐", "1025.ontvjapan.com", 28736, 7, 256}, { "鐚�鹿鐚�, "1016.ontvjapan.com", 28736, 7, 312}, { "�鴻��若��激����鐚器雫", "1018.ontvjapan.com", 28736, 7, 322}, { "�������若�������", "1046.ontvjapan.com", 28736, 7, 331}, - { "����若��祉��c����", "1213.ontvjapan.com", 28736, 7, 334}, - { "�掩�����潟���, "1010.ontvjapan.com", 28768, 7, 221}, + { "����冴��種叱鐚�, "1213.ontvjapan.com", 28736, 7, 334},//����若��祉��c���� �� { "�掩�����潟���, "1010.ontvjapan.com", 28768, 7, 221}, { "茵�����", "1005.ontvjapan.com", 28768, 7, 222}, { "����潟���汐鐚ワ治鐚�, "1008.ontvjapan.com", 28768, 7, 223}, @@ -96,8 +126,7 @@ { "鐚�滋鐚c��若���, "1070.ontvjapan.com", 28864, 7, 353}, { "鐚o汐鐚��", "1069.ontvjapan.com", 28864, 7, 354}, - { "�吾��鴻��祉���, "361ch.epgdata.ontvjapan", 28864, 7, 361}, - { "鐚��������鐚�, "1041.ontvjapan.com", 28896, 7, 251}, - { "鐚��������鐚�, "1042.ontvjapan.com", 28896, 7, 252}, - { "鐚�������式鐔��鐔�示", "1043.ontvjapan.com", 28896, 7, 253}, +// { "�吾��鴻��祉���, "361ch.epgdata.ontvjapan", 28864, 7, 361},// 綮�� 2011/8/31 + { "�������������潟���, "294ch.epgdata.ontvjapan", 28736, 7, 294}, +// { "鐚��������鐚�, "1041.ontvjapan.com", 28896, 7, 251},// 2011/10/1 BS�後���// { "鐚��������鐚�, "1042.ontvjapan.com", 28896, 7, 252},// 2011/10/1 BS�後��� { "鐚�������式鐔��鐔�示", "1043.ontvjapan.com", 28896, 7, 253}, { "鐚э次鐚�鴫鐚�, "1026.ontvjapan.com", 28896, 7, 254}, { "鐔��鐔��鐚<�������", "1040.ontvjapan.com", 28896, 7, 255}, @@ -112,6 +141,5 @@ { "�眼������������, "1027.ontvjapan.com", 28960, 7, 262}, { "鐚��鐚����示鐚�, "1074.ontvjapan.com", 28960, 7, 314}, - { "��������鹿鐚�璽", "1073.ontvjapan.com", 28992, 7, 307},//��������39�� { "��������軸鐚件鹿", "1072.ontvjapan.com", 28992, 7, 308},//��������21�� { "�≪�������", "1047.ontvjapan.com", 28992, 7, 332}, - { "����鴻������, "1062.ontvjapan.com", 28992, 7, 340}, + { "��������鹿鐚�璽", "1073.ontvjapan.com", 28992, 7, 307},//��������39�� { "��������軸鐚件鹿", "1072.ontvjapan.com", 28992, 7, 308},//��������21��// { "�≪�������", "1047.ontvjapan.com", 28992, 7, 332},//BS�≪���������Щ�� { "����鴻������, "1062.ontvjapan.com", 28992, 7, 340}, { "�≪������������, "1193.ontvjapan.com", 28992, 7, 341}, { "鐚�鐚器滋鐚潟�������", "160ch.epgdata.ontvjapan", 29024, 7, 160}, @@ -123,11 +151,11 @@ { "MUSIC ON! TV", "1022.ontvjapan.com", 29024, 7, 325}, { "����冴�����激���D", "1045.ontvjapan.com", 29024, 7, 335},//HD�� { "鐚器滋鐚潟��ャ��鴻��若�", "1076.ontvjapan.com", 29024, 7, 351}, - { "鐚o竺�ユ���������, "147ch.epgdata.ontvjapan", 29056, 7, 147}, - { "�ャ���磁鐚�, "1068.ontvjapan.com", 29056, 7, 257}, - { "fashion TV", "5004.ontvjapan.com", 29056, 7, 291}, +// { "鐚o竺�ユ���������, "147ch.epgdata.ontvjapan", 29056, 7, 147},//綮�� 2010/2/28 + { "�ャ���磁鐚�示鐚�, "1068.ontvjapan.com", 29056, 7, 257},//HD��// { "fashion TV", "5004.ontvjapan.com", 29056, 7, 291},//綮�� 2009/3/31 { "�ャ�������", "300ch.epgdata.ontvjapan", 29056, 7, 300}, - { "�������若����鐚器雫", "1023.ontvjapan.com", 29056, 7, 320}, +// { "�������若����鐚器雫", "1023.ontvjapan.com", 29056, 7, 320},//綮�� 2009/3/31 { "Music Japan TV", "1208.ontvjapan.com", 29056, 7, 321}, { "�ャ���汐鐚ワ七鐚鰹�鐚�, "2002.ontvjapan.com", 29056, 7, 350}, + { "����c����", "1052.ontvjapan.com", 29056, 7, 362}, }; Index: trunk/epgdumpr2/xmldata.c =================================================================== --- trunk/epgdumpr2/xmldata.c (リビジョン 136) +++ trunk/epgdumpr2/xmldata.c (リビジョン 137) @@ -8,10 +8,41 @@ { "BS�吾����", "3007.ontvjapan.com", 16433, 4, 171}, { "BS���", "3008.ontvjapan.com", 16593, 4, 181}, - { "WOWOW", "3009.ontvjapan.com", 16432, 4, 191}, - { "WOWOW2", "3010.ontvjapan.com", 16432, 4, 192}, - { "WOWOW3", "3011.ontvjapan.com", 16432, 4, 193}, - { "�鴻��若�����潟���, "3012.ontvjapan.com", 16529, 4, 200}, +// { "WOWOW", "3009.ontvjapan.com", 16432, 4, 191}, +// { "WOWOW2", "3010.ontvjapan.com", 16432, 4, 192}, +// { "WOWOW3", "3011.ontvjapan.com", 16432, 4, 193}, + { "WOWOW����ゃ�", "3009.ontvjapan.com", 16432, 4, 191}, + { "WOWOW�����, "4192.epgdata.ontvjapan", 17488, 4, 192}, + { "WOWOW�激���, "4193.epgdata.ontvjapan", 17489, 4, 193}, +// { "�鴻��若�����潟���, "3012.ontvjapan.com", 16529, 4, 200}, + { "�鴻��若�����潟���", "3012.ontvjapan.com", 16529, 4, 200}, + { "�鴻��若�����潟���", "4201.epgdata.ontvjapan", 17520, 4, 201}, + { "�鴻��若�����潟���", "4202.epgdata.ontvjapan", 17520, 4, 202}, { "BS11", "3013.ontvjapan.com", 16528, 4, 211}, { "TwellV", "3014.ontvjapan.com", 16530, 4, 222}, + { "�冗�紊у�1", "4231.epgdata.ontvjapan", 18098, 4, 231}, + { "�冗�紊у�2", "4232.epgdata.ontvjapan", 18098, 4, 232}, + { "�冗�紊у�3", "4233.epgdata.ontvjapan", 18098, 4, 233}, + { "�違��若�����潟���, "4234.epgdata.ontvjapan", 18224, 4, 234}, + { "BS�≪�������", "1047.ontvjapan.com", 18033, 4, 236}, + { "FOX bs238", "4238.epgdata.ontvjapan", 18096, 4, 238}, + { "BS�鴻����鐚�, "4241.epgdata.ontvjapan", 18097, 4, 241}, + { "J SPORTS 1", "4242.epgdata.ontvjapan", 18225, 4, 242}, + { "J SPORTS 2", "4243.epgdata.ontvjapan", 18226, 4, 243}, + { "J SPORTS 3", "4244.epgdata.ontvjapan", 18257, 4, 244}, + { "J SPORTS 4", "4245.epgdata.ontvjapan", 18258, 4, 245}, + { "BS�c�����с�", "4251.epgdata.ontvjapan", 18288, 4, 251}, + { "IMAGICA BS", "4252.epgdata.ontvjapan", 18256, 4, 252}, + { "�ユ����絨������潟���, "4255.epgdata.ontvjapan", 18289, 4, 255}, + { "����冴��若�����潟���, "1090.ontvjapan.com", 18034, 4, 256}, + { "D-Life", "4258.epgdata.ontvjapan", 18290, 4, 258}, + { "NHK膩�������吾��鰹��延根鐚�, "4291.epgdata.ontvjapan", 17168, 4, 291}, + { "NHK����������с�鐚��篋��", "4292.epgdata.ontvjapan", 17168, 4, 292}, + { "�ユ������, "4294.epgdata.ontvjapan", 17169, 4, 294}, + { "��������, "4295.epgdata.ontvjapan", 17169, 4, 295}, + { "TBS�����, "4296.epgdata.ontvjapan", 17169, 4, 296}, + { "������篋�, "4297.epgdata.ontvjapan", 17169, 4, 297}, + { "��������, "4298.epgdata.ontvjapan", 17168, 4, 298}, + { "�冗�紊у������, "4531.epgdata.ontvjapan", 18098, 4, 531}, + { "WNI", "4910.ontvjapan.com", 16626, 4, 910}, }; @@ -29,11 +60,10 @@ { "�鴻�����鰹�鐚��", "802ch.epgdata.ontvjapan", 24736, 6, 802}, { "鐔�������, "100ch.epgdata.ontvjapan", 28736, 7, 100}, - { "�ゃ��帥�������鐚器雫", "194ch.epgdata.ontvjapan", 28736, 7, 194}, +// { "�ゃ��帥�������鐚器雫", "194ch.epgdata.ontvjapan", 28736, 7, 194},//綮�� 2010/9/16/ { "鐚��������鐚ワ竺鐚逸汐", "1025.ontvjapan.com", 28736, 7, 256}, { "鐚�鹿鐚�, "1016.ontvjapan.com", 28736, 7, 312}, { "�鴻��若��激����鐚器雫", "1018.ontvjapan.com", 28736, 7, 322}, { "�������若�������", "1046.ontvjapan.com", 28736, 7, 331}, - { "����若��祉��c����", "1213.ontvjapan.com", 28736, 7, 334}, - { "�掩�����潟���, "1010.ontvjapan.com", 28768, 7, 221}, + { "����冴��種叱鐚�, "1213.ontvjapan.com", 28736, 7, 334},//����若��祉��c���� �� { "�掩�����潟���, "1010.ontvjapan.com", 28768, 7, 221}, { "茵�����", "1005.ontvjapan.com", 28768, 7, 222}, { "����潟���汐鐚ワ治鐚�, "1008.ontvjapan.com", 28768, 7, 223}, @@ -52,8 +82,7 @@ { "鐚�滋鐚c��若���, "1070.ontvjapan.com", 28864, 7, 353}, { "鐚o汐鐚��", "1069.ontvjapan.com", 28864, 7, 354}, - { "�吾��鴻��祉���, "361ch.epgdata.ontvjapan", 28864, 7, 361}, - { "鐚��������鐚�, "1041.ontvjapan.com", 28896, 7, 251}, - { "鐚��������鐚�, "1042.ontvjapan.com", 28896, 7, 252}, - { "鐚�������式鐔��鐔�示", "1043.ontvjapan.com", 28896, 7, 253}, +// { "�吾��鴻��祉���, "361ch.epgdata.ontvjapan", 28864, 7, 361},// 綮�� 2011/8/31 + { "�������������潟���, "294ch.epgdata.ontvjapan", 28736, 7, 294}, +// { "鐚��������鐚�, "1041.ontvjapan.com", 28896, 7, 251},// 2011/10/1 BS�後���// { "鐚��������鐚�, "1042.ontvjapan.com", 28896, 7, 252},// 2011/10/1 BS�後��� { "鐚�������式鐔��鐔�示", "1043.ontvjapan.com", 28896, 7, 253}, { "鐚э次鐚�鴫鐚�, "1026.ontvjapan.com", 28896, 7, 254}, { "鐔��鐔��鐚<�������", "1040.ontvjapan.com", 28896, 7, 255}, @@ -68,6 +97,5 @@ { "�眼������������, "1027.ontvjapan.com", 28960, 7, 262}, { "鐚��鐚����示鐚�, "1074.ontvjapan.com", 28960, 7, 314}, - { "��������鹿鐚�璽", "1073.ontvjapan.com", 28992, 7, 307},//��������39�� { "��������軸鐚件鹿", "1072.ontvjapan.com", 28992, 7, 308},//��������21�� { "�≪�������", "1047.ontvjapan.com", 28992, 7, 332}, - { "����鴻������, "1062.ontvjapan.com", 28992, 7, 340}, + { "��������鹿鐚�璽", "1073.ontvjapan.com", 28992, 7, 307},//��������39�� { "��������軸鐚件鹿", "1072.ontvjapan.com", 28992, 7, 308},//��������21��// { "�≪�������", "1047.ontvjapan.com", 28992, 7, 332},//BS�≪���������Щ�� { "����鴻������, "1062.ontvjapan.com", 28992, 7, 340}, { "�≪������������, "1193.ontvjapan.com", 28992, 7, 341}, { "鐚�鐚器滋鐚潟�������", "160ch.epgdata.ontvjapan", 29024, 7, 160}, @@ -79,11 +107,11 @@ { "MUSIC ON! TV", "1022.ontvjapan.com", 29024, 7, 325}, { "����冴�����激���D", "1045.ontvjapan.com", 29024, 7, 335},//HD�� { "鐚器滋鐚潟��ャ��鴻��若�", "1076.ontvjapan.com", 29024, 7, 351}, - { "鐚o竺�ユ���������, "147ch.epgdata.ontvjapan", 29056, 7, 147}, - { "�ャ���磁鐚�, "1068.ontvjapan.com", 29056, 7, 257}, - { "fashion TV", "5004.ontvjapan.com", 29056, 7, 291}, +// { "鐚o竺�ユ���������, "147ch.epgdata.ontvjapan", 29056, 7, 147},//綮�� 2010/2/28 + { "�ャ���磁鐚�示鐚�, "1068.ontvjapan.com", 29056, 7, 257},//HD��// { "fashion TV", "5004.ontvjapan.com", 29056, 7, 291},//綮�� 2009/3/31 { "�ャ�������", "300ch.epgdata.ontvjapan", 29056, 7, 300}, - { "�������若����鐚器雫", "1023.ontvjapan.com", 29056, 7, 320}, +// { "�������若����鐚器雫", "1023.ontvjapan.com", 29056, 7, 320},//綮�� 2009/3/31 { "Music Japan TV", "1208.ontvjapan.com", 29056, 7, 321}, { "�ャ���汐鐚ワ七鐚鰹�鐚�, "2002.ontvjapan.com", 29056, 7, 350}, + { "����c����", "1052.ontvjapan.com", 29056, 7, 362}, };