From a76a03c0d815680e3e8fc52f24f60a30177d3021 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 11 Jan 2004 18:00:00 +0100 Subject: Version 1.3.1 - Fixed a lockup in the EPG scanner when no non-primary device was available (thanks to Martin Holst for reporting this one). - Fixed a compiler warning about virtual cConfig::Load() functions (thanks to Lauri Tischler for reporting this one). - Fixed a warning about character comparison in libsi/si.c (thanks to Lauri Tischler for reporting this one). - The new parameter "Update channels" in the "Setup/DVB" menu can be used to control if and how channels will be automatically updated (see MANUAL). This has already been part of the 'autopid' patch by Andreas Schultz and has now been adopted. - Fixed a crash in case there is no DVB hardware present (thanks to Sascha Volkenandt for reporting this one). - Changed calculation of channel ids to make it work for tv stations that use the undefined NID value 0 (thanks to Teemu Rantanen for reporting this one). - Enhanced the SDT filter to handle multi part sections. - Added support for selecting preferred EPG languages (based upon a patch by Teemu Rantanen). - Fixed a 'const' in libsi/si.h (thanks to Marcel Wiesweg). - Fixed the 'su' call in 'runvdr' to make it work on systems that require the user name to appear before the command option (thanks to Robert Huitl). - Fixed testing for matching section filters in case they are turned off (thanks to Marcel Wiesweg). - In case of incomplete sections an error message is now logged only every 10 seconds. - Fixed a possible NULL pointer access in cEITScanner::Process() (thanks to Andreas Kool). - The actual transponder data is now taken from the NIT and existing channels are adjusted if necessary. If the NIT contains new transponders, they are scanned for channels during the next EPG scan. Note that only the satellite branches are tested, cable and terrestrial need to be tested by somebody who actually has such equipment. --- channels.conf | 188 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 94 insertions(+), 94 deletions(-) (limited to 'channels.conf') diff --git a/channels.conf b/channels.conf index b1ad616..10628ac 100644 --- a/channels.conf +++ b/channels.conf @@ -1,95 +1,95 @@ -RTL,RTL Television:12188:h:S19.2E:27500:163:104:105:0:12003:1:1089:0 -SAT.1:12480:v:S19.2E:27500:1791:1792;1795:34:0:46:133:33:0 -ProSieben:12480:v:S19.2E:27500:255:256;257:32:0:898:133:33:0 -RTL2:12188:h:S19.2E:27500:166:128:68:0:12020:1:1089:0 -Das Erste:11837:h:S19.2E:27500:101:102:104:0:28106:1:1101:0 -Bayerisches FS:11837:h:S19.2E:27500:201:202:204:0:28107:1:1101:0 -hessen fernsehen:11837:h:S19.2E:27500:301:302:304:0:28108:1:1101:0 -NDR FS MV:12110:h:S19.2E:27500:2401:2402:2404:0:28224:1:1073:0 -SR Fernsehen Suedwest:11837:h:S19.2E:27500:501:502:504:0:28110:1:1101:0 -WDR FERNSEHEN:11837:h:S19.2E:27500:601:602:604:0:28111:1:1101:0 -BR-alpha:11837:h:S19.2E:27500:701:702:704:0:28112:1:1101:0 -SÜDWEST BW:11837:h:S19.2E:27500:801:802:804:0:28113:1:1101:0 -Phoenix:11837:h:S19.2E:27500:901:902:904:0:28114:1:1101:0 -ZDF:11954:h:S19.2E:27500:110:120;125:130:0:28006:1:1079:0 -3sat:11954:h:S19.2E:27500:210:220:230:0:28007:1:1079:0 -KiKa:11954:h:S19.2E:27500:310:320:330:0:28008:1:1079:0 -arte:11836:h:S19.2E:27500:401:402,403:404:0:28109:1:1101:0 -ORF 1:12692:h:S19.2E:22000:160:161;163:165:1762,D05,1702,1801:13001:1:1117:0 -ORF 2:12692:h:S19.2E:22000:500:501;503:505:1762,D05,1702,1801:13002:1:1117:0 -ZDFinfokanal:11954:h:S19.2E:27500:610:620:130:0:28011:1:1079:0 -CNN Int.:11778:v:S19.2E:27500:165:100:47:0:28522:1:1068:0 -S RTL,Super RTL:12188:h:S19.2E:27500:165:120:65:0:12040:1:1089:0 -VOX:12188:h:S19.2E:27500:167:136:71:0:12060:1:1089:0 -KABEL1:12480:v:S19.2E:27500:511:512:33:0:899:133:33:0 -NEUN LIVE,NEUN LIVE Television:12480:v:S19.2E:27500:767:768:35:0:897:133:33:0 -DSF:12480:v:S19.2E:27500:1023:1024:0:0:900:133:33:0 -HSEurope,Home Shopping Europe:12480:v:S19.2E:27500:1279:1280:37:0:40:133:33:0 -Bloomberg TV Germany:12552:v:S19.2E:22000:162:99:0:0:12160:1:1108:0 -EURONEWS:11817:v:S19.2E:27500:163:92,93:0:500,100:8004:1:1070:0 -Sky News:11597:v:S19.2E:22000:305:306:0:0:28707:1:1026:0 -Veronica/FoxKids:12574:h:S19.2E:22000:518+8190:92:38:622,602,100:5020:53:1109:0 -BVN:12574:h:S19.2E:22000:515+8190:96:36:0:5025:53:1109:0 -CNBC Europe:12610:v:S19.2E:22000:944:945:0:0:12200:1:1112:0 -n-tv:12670:v:S19.2E:22000:162:96:55:0:12730:1:1116:0 -Al Jazeera:11568:v:S19.2E:22000:55:56:0:0:9021:1:1024:0 -TW1:12692:h:S19.2E:22000:166:167:168:0:13013:1:1117:0 -Eurosport:11954:h:S19.2E:27500:410:420:430:0:28009:1:1079:0 -EinsExtra:12110:h:S19.2E:27500:101:102:0:0:28201:1:1073:0 -EinsFestival:12110:h:S19.2E:27500:201:202:0:0:28202:1:1073:0 -EinsMuXx:12110:h:S19.2E:27500:301:302:0:0:28203:1:1073:0 -ZDFtheaterkanal:11954:h:S19.2E:27500:1110:1120:130:0:28016:1:1079:0 -ZDFdokukanal:11954:h:S19.2E:27500:660:670:130:0:28014:1:1079:0 -MDR FERNSEHEN:12110:h:S19.2E:27500:401:402:404:0:28204:1:1073:0 -RBB Brandenburg:12110:h:S19.2E:27500:501:502:504:0:28205:1:1073:0 -RBB Berlin:12110:h:S19.2E:27500:601:602:604:0:28206:1:1073:0 +RTL,RTL Television:12187:hC34:S19.2E:27500:163:104:105:0:12003:1:1089:0 +SAT.1:12480:vC34:S19.2E:27500:1791:1792;1795:34:0:46:133:33:0 +ProSieben:12480:vC34:S19.2E:27500:255:256;257:32:0:898:133:33:0 +RTL2:12187:hC34:S19.2E:27500:166:128:68:0:12020:1:1089:0 +Das Erste:11836:hC34:S19.2E:27500:101:102:104:0:28106:1:1101:0 +Bayerisches FS:11836:hC34:S19.2E:27500:201:202:204:0:28107:1:1101:0 +hessen fernsehen:11836:hC34:S19.2E:27500:301:302:304:0:28108:1:1101:0 +NDR FS MV:12109:hC34:S19.2E:27500:2401:2402:2404:0:28224:1:1073:0 +SR Fernsehen Suedwest:11836:hC34:S19.2E:27500:501:502:504:0:28110:1:1101:0 +WDR Köln:11836:hC34:S19.2E:27500:601:602:604:0:28111:1:1101:0 +BR-alpha:11836:hC34:S19.2E:27500:701:702:704:0:28112:1:1101:0 +SÜDWEST BW:11836:hC34:S19.2E:27500:801:802:804:0:28113:1:1101:0 +Phoenix:11836:hC34:S19.2E:27500:901:902:904:0:28114:1:1101:0 +ZDF:11953:hC34:S19.2E:27500:110:120;125:130:0:28006:1:1079:0 +3sat:11953:hC34:S19.2E:27500:210:220:230:0:28007:1:1079:0 +KiKa:11953:hC34:S19.2E:27500:310:320:330:0:28008:1:1079:0 +arte:11836:hC34:S19.2E:27500:401:402,403:404:0:28109:1:1101:0 +ORF 1:12692:hC56:S19.2E:22000:160:161,162;163:165:1762,D05,1702,1801:13001:1:1117:0 +ORF 2:12692:hC56:S19.2E:22000:500:501;503:505:1762,D05,1702,1801:13002:1:1117:0 +ZDFinfokanal:11953:hC34:S19.2E:27500:610:620:130:0:28011:1:1079:0 +CNN Int.:11778:vC34:S19.2E:27500:165:100:47:0:28522:1:1068:0 +S RTL,Super RTL:12187:hC34:S19.2E:27500:165:120:65:0:12040:1:1089:0 +VOX:12187:hC34:S19.2E:27500:167:136:71:0:12060:1:1089:0 +KABEL1:12480:vC34:S19.2E:27500:511:512:33:0:899:133:33:0 +NEUN LIVE,NEUN LIVE Television:12480:vC34:S19.2E:27500:767:768:35:0:897:133:33:0 +DSF:12480:vC34:S19.2E:27500:1023:1024:0:0:900:133:33:0 +HSEurope,Home Shopping Europe:12480:vC34:S19.2E:27500:1279:1280:37:0:40:133:33:0 +Bloomberg TV Germany:12552:vC56:S19.2E:22000:162:99:0:0:12160:1:1108:0 +EURONEWS:11817:vC34:S19.2E:27500:163:92,93:0:500,100:8004:1:1070:0 +Sky News:11597:vC56:S19.2E:22000:305:306:0:0:28707:1:1026:0 +Veronica/FoxKids:12574:hC56:S19.2E:22000:518+8190:92:38:622,602,100:5020:53:1109:0 +BVN:12574:hC56:S19.2E:22000:515+8190:96:36:0:5025:53:1109:0 +CNBC Europe:12610:vC56:S19.2E:22000:944:945:0:0:12200:1:1112:0 +n-tv:12669:vC56:S19.2E:22000:162:96:55:0:12730:1:1116:0 +Al Jazeera:11567:vC56:S19.2E:22000:55:56:0:0:9021:1:1024:0 +TW1:12692:hC56:S19.2E:22000:166:167:168:0:13013:1:1117:0 +Eurosport:11953:hC34:S19.2E:27500:410:420:430:0:28009:1:1079:0 +EinsExtra:12109:hC34:S19.2E:27500:101:102:0:0:28201:1:1073:0 +EinsFestival:12109:hC34:S19.2E:27500:201:202:0:0:28202:1:1073:0 +EinsMuXx:12109:hC34:S19.2E:27500:301:302:0:0:28203:1:1073:0 +ZDFtheaterkanal:11953:hC34:S19.2E:27500:1110:1120:130:0:28016:1:1079:0 +ZDFdokukanal:11953:hC34:S19.2E:27500:660:670:130:0:28014:1:1079:0 +MDR FERNSEHEN:12109:hC34:S19.2E:27500:401:402:404:0:28204:1:1073:0 +RBB Brandenburg:12109:hC34:S19.2E:27500:501:502:504:0:28205:1:1073:0 +RBB Berlin:12109:hC34:S19.2E:27500:601:602:604:0:28206:1:1073:0 :Premiere World -START,PREMIERE START:11797:h:S19.2E:27500:255:256:32:1702,1722,1801:8:133:2:0 -PREM 1,PREMIERE 1:11797:h:S19.2E:27500:511:512,513;515:0:1702,1722,1801:10:133:2:0 -PREM 2,PREMIERE 2:11797:h:S19.2E:27500:1791:1792,1793;1795:0:1702,1722,1801:11:133:2:0 -PREM 3,PREMIERE 3:11797:h:S19.2E:27500:2303:2304,2305:0:1702,1722,1801:43:133:2:0 -PREM 4,PREMIERE 4:11797:h:S19.2E:27500:767:768,769:0:1702,1722,1801:9:133:2:0 -PREM 5,PREMIERE 5:11797:h:S19.2E:27500:1279:1280,1281:0:1702,1722,1801:29:133:2:0 -PREM 6,PREMIERE 6:11797:h:S19.2E:27500:1535:1536:0:1702,1722,1801:41:133:2:0 -PREM 7,PREMIERE 7:11797:h:S19.2E:27500:1023:1024:0:1702,1722,1801:20:133:2:0 -DISNEY,DISNEY CHANNEL:11758:h:S19.2E:27500:2559:2560:0:1702,1722,1801:34:133:17:0 +START,PREMIERE START:11797:hC34:S19.2E:27500:255:256:32:1702,1722,1801:8:133:2:0 +PREM 1,PREMIERE 1:11797:hC34:S19.2E:27500:511:512,513;515:0:1702,1722,1801:10:133:2:0 +PREM 2,PREMIERE 2:11797:hC34:S19.2E:27500:1791:1792,1793;1795:0:1702,1722,1801:11:133:2:0 +PREM 3,PREMIERE 3:11797:hC34:S19.2E:27500:2303:2304,2305:0:1702,1722,1801:43:133:2:0 +PREM 4,PREMIERE 4:11797:hC34:S19.2E:27500:767:768,769:0:1702,1722,1801:9:133:2:0 +PREM 5,PREMIERE 5:11797:hC34:S19.2E:27500:1279:1280,1281:0:1702,1722,1801:29:133:2:0 +PREM 6,PREMIERE 6:11797:hC34:S19.2E:27500:1535:1536:0:1702,1722,1801:41:133:2:0 +PREM 7,PREMIERE 7:11797:hC34:S19.2E:27500:1023:1024:0:1702,1722,1801:20:133:2:0 +DISNEY,DISNEY CHANNEL:11758:hC34:S19.2E:27500:2559:2560:0:1702,1722,1801:34:133:17:0 :Premiere Direkt -DIREKT,PREMIERE DIREKT:12031:h:S19.2E:27500:2815:2816,2817;2819:0:0:18:133:4:0 +DIREKT,PREMIERE DIREKT:12031:hC34:S19.2E:27500:2815:2816,2817;2819:0:0:18:133:4:0 :PW Erotic -B-UHSE,BEATE-UHSE.TV:12071:h:S19.2E:27500:1023:1024:0:1702,1722,1801:21:133:1:0 -EROTIK,PREMIERE EROTIK:12031:h:S19.2E:27500:1279:0:0:1702,1722,1801:513:133:4:0 +B-UHSE,BEATE-UHSE.TV:12070:hC34:S19.2E:27500:1023:1024:0:1702,1722,1801:21:133:1:0 +EROTIK,PREMIERE EROTIK:12031:hC34:S19.2E:27500:1279:0:0:1702,1722,1801:513:133:4:0 :Sportsworld -SPORT 1,PREMIERE SPORT 1:11720:h:S19.2E:27500:255:256,257:0:1702,1722,1801:17:133:3:0 -SPORT 2,PREMIERE SPORT 2:12031:h:S19.2E:27500:3839:3840,3841:0:1702,1722,1801:27:133:4:0 +SPORT 1,PREMIERE SPORT 1:11719:hC34:S19.2E:27500:255:256,257:0:1702,1722,1801:17:133:3:0 +SPORT 2,PREMIERE SPORT 2:12031:hC34:S19.2E:27500:3839:3840,3841:0:1702,1722,1801:27:133:4:0 :Beta Digital -N24:12480:v:S19.2E:27500:2047:2048:36:0:47:133:33:0 -CNBC:11954:h:S19.2E:27500:510:520:530:0:28010:1:1079:0 -Liberty TV.com:12610:v:S19.2E:22000:941:943:0:0:12199:1:1112:0 +N24:12480:vC34:S19.2E:27500:2047:2048:36:0:47:133:33:0 +CNBC:11953:hC34:S19.2E:27500:510:520:530:0:28010:1:1079:0 +Liberty TV.com:12610:vC56:S19.2E:22000:941:943:0:0:12199:1:1112:0 :- -ProSieben Austria:12051:v:S19.2E:27500:161:84:36:0:20002:1:1082:0 -Kabel 1 Schweiz:12051:v:S19.2E:27500:162:163:165:0:20003:1:1082:0 -Kabel 1 Austria:12051:v:S19.2E:27500:166:167:169:0:20004:1:1082:0 -ProSieben Schweiz:12051:v:S19.2E:27500:289:290:33:0:20001:1:1082:0 -FRANCE 5:12207:v:S19.2E:27500:160:80:32:0:8501:1:1090:0 -LCP:12207:v:S19.2E:27500:165:100:0:0:8506:1:1090:0 -ESCALES:12285:v:S19.2E:27500:165:100:0:500,100:17025:1:1094:0 -CANAL CLUB:12324:v:S19.2E:27500:160:80:0:0:8612:1:1096:0 -ASTRA-Mosaic:12552:v:S19.2E:22000:175:176:0:0:3988:1:1108:0 -ASTRA-Mosaic 2:12552:v:S19.2E:22000:179:120:0:0:3987:1:1108:0 -ASTRA-Mosaic 3:12552:v:S19.2E:22000:182:169:0:0:3986:1:1108:0 -ASTRA-Mosaic 4:12552:v:S19.2E:22000:185:170:0:0:3985:1:1108:0 -ASTRA-Mosaic 5:12552:v:S19.2E:22000:163:164:0:0:3984:1:1108:0 -Chamber TV:12552:v:S19.2E:22000:55:56:0:0:12180:1:1108:0 -RTL TELE Letzebuerg:12552:v:S19.2E:22000:168:144,146:74:0:3994:1:1108:0 -Yorin:12574:h:S19.2E:22000:512+8190:84:33:622,602,100:5010:53:1109:0 -MTV2 Pop Channel:12225:h:S19.2E:27500:513:661:577:0:28640:1:1091:0 +ProSieben Austria:12051:vC34:S19.2E:27500:161:84:36:0:20002:1:1082:0 +Kabel 1 Schweiz:12051:vC34:S19.2E:27500:162:163:165:0:20003:1:1082:0 +Kabel 1 Austria:12051:vC34:S19.2E:27500:166:167:169:0:20004:1:1082:0 +ProSieben Schweiz:12051:vC34:S19.2E:27500:289:290:33:0:20001:1:1082:0 +FRANCE 5:12207:vC34:S19.2E:27500:160:80:32:0:8501:1:1090:0 +LCP:12207:vC34:S19.2E:27500:165:100:0:0:8506:1:1090:0 +ESCALES:12285:vC34:S19.2E:27500:165:100:0:500,100:17025:1:1094:0 +CANAL CLUB:12324:vC34:S19.2E:27500:160:80:0:0:8612:1:1096:0 +ASTRA-Mosaic:12552:vC56:S19.2E:22000:175:176:0:0:3988:1:1108:0 +ASTRA-Mosaic 2:12552:vC56:S19.2E:22000:179:120:0:0:3987:1:1108:0 +ASTRA-Mosaic 3:12552:vC56:S19.2E:22000:182:169:0:0:3986:1:1108:0 +ASTRA-Mosaic 4:12552:vC56:S19.2E:22000:185:170:0:0:3985:1:1108:0 +ASTRA-Mosaic 5:12552:vC56:S19.2E:22000:163:164:0:0:3984:1:1108:0 +Chamber TV:12552:vC56:S19.2E:22000:55:56:0:0:12180:1:1108:0 +RTL TELE Letzebuerg:12552:vC56:S19.2E:22000:168:144,146:74:0:3994:1:1108:0 +Yorin:12574:hC56:S19.2E:22000:512+8190:84:33:622,602,100:5010:53:1109:0 +MTV2 Pop Channel:12226:hC34:S19.2E:27500:513:661:577:0:28640:1:1091:0 Via 1 - Schöner Reisen:12148:h:S19.2E:27500:511:512:0:0:44:0:0:0 Video Italia:12610:v:S19.2E:22000:121:122:0:0:12220:0:0:0 -VIVA:12670:v:S19.2E:22000:309:310:311:0:12732:1:1116:0 -VIVA PLUS:12552:v:S19.2E:22000:171:172:173:0:12120:1:1108:0 -MTV Central:11739:v:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0 -QVC GERMANY:12552:v:S19.2E:22000:165:166:167:0:12100:1:1108:0 -TELE 5:12480:v:S19.2E:27500:1535:1536:38:0:51:133:33:0 +VIVA:12669:vC56:S19.2E:22000:309:310:311:0:12732:1:1116:0 +VIVA PLUS:12552:vC56:S19.2E:22000:171:172:173:0:12120:1:1108:0 +MTV Central:11739:vC34:S19.2E:27500:3031:3032:3034:0:28653:1:1066:0 +QVC GERMANY:12552:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0 +TELE 5:12480:vC34:S19.2E:27500:1535:1536:38:0:51:133:33:0 :@201 Sky Sky One:106:h:S28.2E:0:160:80:0:30:222:0:0:0 Sky One Mix:107:h:S28.2E:0:160:80:0:30:919:0:0:0 @@ -97,14 +97,14 @@ itv2:226:h:S28.2E:0:160:80:0:30:451:0:0:0 sci-fi:130:h:S28.2E:0:160:80:0:30:161:0:0:0 Paramount Comedy:127:h:S28.2E:0:160:80:0:30:185:0:0:0 :@900 Some 'seed' channels -Chelsea TV:11778:v:S28.2E:27500:2308+2304:2309:0:960,961:9307:2:2004:0 -Sky One:12285:v:S28.2E:27500:2311+2304:2312,2313:2307:960,961:4703:2:2030:0 -WDR Münster:12421:h:S19.2E:27500:101:102:104:0:28310:1:1201:0 -Going Places:10921:h:S28.2E:22000:2310+2304:2311:2312:0:5008:2:2055:0 -Animal Plnt+:12070:h:S28.2E:27500:2315+2307:2316:0:960,961:50002:2:2019:0 -S1T:11954:h:S28.2E:27500:0:0:0:0:4409:2:2030:0 -CNN:12032:v:S28.2E:27500:2309:2311:2310:0:7140:2:2018:0 -BBC PARL'MNT:12129:v:S28.2E:27500:2306:2308,2309:2307:0:7300:2:2022:0 -AL HAYAT:11200:v:S13.0E:27500:413:414:0:0:4733:318:13400:0 -EURO1080:12168:v:S19.2E:27500:308:256:0:FF:21100:1:1088:0 +Chelsea TV:11778:vC23:S28.2E:27500:2308+2304:2309:0:960,961:9307:2:2004:0 +Sky One:12285:vC23:S28.2E:27500:2311+2304:2312,2313:2307:960,961:4703:2:2030:0 +WDR Münster:12421:hC34:S19.2E:27500:101:102:104:0:28310:1:1201:0 +Going Places:10920:hC56:S28.2E:22000:2310+2304:2311:2312:0:5008:2:2055:0 +Animal Plnt+:12070:hC23:S28.2E:27500:2315+2307:2316:0:960,961:50002:2:2019:0 +S1T:12285:vC23:S28.2E:27500:2311+2304:2312,2313:2314:960,961:4409:2:2030:0 +CNN:12051:vC23:S28.2E:27500:2309:2311:2310:0:7140:2:2018:0 +BBC PARL'MNT:12129:vC23:S28.2E:27500:2306:2308,2309:2307:0:7300:2:2022:0 +AL HAYAT:11200:vC56:S13.0E:27500:413:414:0:0:4733:318:13400:0 +EURO1080:12168:vC34:S19.2E:27500:308:256:0:FF:21100:1:1088:0 :@1000 New channels -- cgit v1.2.3