From 3038be2a6a849e726d6fe99236d5dc61b679198f Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Mon, 1 Nov 2004 18:00:00 +0100 Subject: =?UTF-8?q?Version=201.3.15=20-=20Fixed=20some=20typos=20in=20the?= =?UTF-8?q?=20Makefile's=20'font'=20target=20(thanks=20to=20Uwe=20Hanke).?= =?UTF-8?q?=20-=20Added=20more=20checks=20and=20polling=20when=20getting?= =?UTF-8?q?=20frontend=20events=20(based=20on=20a=20patch=20=20=20from=20W?= =?UTF-8?q?erner=20Fink).=20-=20No=20longer=20explicitly=20waiting=20for?= =?UTF-8?q?=20a=20tuner=20lock=20when=20switching=20channels=20=20=20(appa?= =?UTF-8?q?rently=20setting=20"live"=20PIDs=20before=20the=20tuner=20is=20?= =?UTF-8?q?locked=20doesn't=20hurt).=20=20=20Moved=20the=20wait=20into=20c?= =?UTF-8?q?Device::AttachReceiver()=20instead.=20-=20Immediately=20display?= =?UTF-8?q?ing=20the=20new=20channel=20info=20when=20switching=20channel?= =?UTF-8?q?=20groups.=20-=20Moved=20the=20main=20program=20loop=20variable?= =?UTF-8?q?s=20further=20up=20to=20allow=20compilation=20with=20=20=20olde?= =?UTF-8?q?r=20compiler=20versions=20(thanks=20to=20Marco=20Schl=C3=BC?= =?UTF-8?q?=C3=9Fler=20for=20reporting=20this=20one).=20-=20Now=20calling?= =?UTF-8?q?=20pthread=5Fcond=5Fbroadcast()=20in=20the=20destructor=20of=20?= =?UTF-8?q?cCondWait=20and=20=20=20cCondVar=20to=20make=20sure=20any=20sle?= =?UTF-8?q?epers=20will=20wake=20up=20(suggested=20by=20Werner=20Fink).=20?= =?UTF-8?q?=20=20Also=20using=20pthread=5Fcond=5Fbroadcast()=20instead=20o?= =?UTF-8?q?f=20pthread=5Fcond=5Fsignal()=20in=20=20=20cCondWait,=20in=20ca?= =?UTF-8?q?se=20there=20is=20more=20than=20one=20sleeper.=20-=20Making=20s?= =?UTF-8?q?ure=20that=20timers=20and=20channels=20are=20only=20saved=20tog?= =?UTF-8?q?ether,=20in=20a=20consistent=20=20=20manner=20(thanks=20to=20Mi?= =?UTF-8?q?rko=20D=C3=B6lle=20for=20reporting=20a=20problem=20with=20incon?= =?UTF-8?q?sistent=20=20=20channel=20and=20timer=20lists).=20-=20Now=20han?= =?UTF-8?q?dling=20the=20channel=20name,=20short=20name=20and=20provider?= =?UTF-8?q?=20separately.=20cChannel=20=20=20therefore=20has=20two=20new?= =?UTF-8?q?=20functions,=20ShortName()=20and=20Provider().=20ShortName()?= =?UTF-8?q?=20=20=20can=20be=20used=20to=20display=20a=20short=20version?= =?UTF-8?q?=20of=20the=20name=20(in=20case=20such=20a=20version=20=20=20is?= =?UTF-8?q?=20available).=20The=20optional=20boolean=20parameter=20of=20Sh?= =?UTF-8?q?ortName()=20can=20be=20set=20to=20=20=20true=20to=20make=20it?= =?UTF-8?q?=20return=20the=20name,=20if=20no=20short=20name=20is=20availab?= =?UTF-8?q?le.=20=20=20The=20sequence=20of=20'name'=20and=20'short=20name'?= =?UTF-8?q?=20in=20the=20channels.conf=20file=20has=20been=20=20=20swapped?= =?UTF-8?q?=20(see=20man=20vdr(5)).=20-=20Added=20the=20'portal=20name'=20?= =?UTF-8?q?to=20cChannels=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).?= =?UTF-8?q?=20-=20Fixed=20handling=20key=20codes=20that=20start=20with=200?= =?UTF-8?q?x1B=20in=20the=20KBD=20remote=20control=20code.=20-=20Now=20usi?= =?UTF-8?q?ng=20qsort()=20to=20sort=20cListBase=20lists.=20For=20this,=20t?= =?UTF-8?q?he=20virtual=20function=20=20=20cListObject::operator<()=20has?= =?UTF-8?q?=20been=20replaced=20with=20cListObject::Compare().=20=20=20Plu?= =?UTF-8?q?gins=20that=20implement=20derived=20cListObject=20classes=20may?= =?UTF-8?q?=20need=20to=20adjust=20their=20=20=20code.=20-=20The=20"Channe?= =?UTF-8?q?ls"=20menu=20can=20now=20be=20sorted=20"by=20number"=20(default?= =?UTF-8?q?),=20"by=20name"=20and=20=20=20"by=20provider".=20While=20in=20?= =?UTF-8?q?the=20"Channels"=20menu,=20pressing=20the=20'0'=20key=20switche?= =?UTF-8?q?s=20=20=20through=20these=20modes.=20-=20Fixed=20the=20buffer?= =?UTF-8?q?=20size=20in=20cRecording::SortName().=20-=20Now=20displaying?= =?UTF-8?q?=20the=20name=20of=20the=20remote=20control=20for=20which=20the?= =?UTF-8?q?=20keys=20are=20being=20=20=20learned=20inside=20the=20menu=20t?= =?UTF-8?q?o=20avoid=20overwriting=20the=20date/time=20in=20the=20'classic?= =?UTF-8?q?'=20=20=20skin=20(thanks=20to=20Oliver=20Endriss=20for=20report?= =?UTF-8?q?ing=20this=20one).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- channels.conf | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'channels.conf') diff --git a/channels.conf b/channels.conf index d7f7db0..acb25d5 100644 --- a/channels.conf +++ b/channels.conf @@ -1,4 +1,4 @@ -RTL,RTL Television;RTL World:12187:hC34:S19.2E:27500:163:104=deu:105:0:12003:1:1089:0 +RTL Television,RTL;RTL World:12187:hC34:S19.2E:27500:163:104=deu:105:0:12003:1:1089:0 SAT.1;ProSiebenSat.1:12480:vC34:S19.2E:27500:1791:1792=deu;1795=deu:34:0:46:133:33:0 ProSieben;ProSiebenSat.1:12480:vC34:S19.2E:27500:255:256=deu;257=deu:32:0:898:133:33:0 RTL2;RTL World:12187:hC34:S19.2E:27500:166:128=deu:68:0:12020:1:1089:0 @@ -19,10 +19,10 @@ ORF 1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1702,1801:130 ORF 2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1702,1801:13002:1:1117:0 ZDFinfokanal;ZDFvision:11953:hC34:S19.2E:27500:610:620=deu:130:0:28011:1:1079:0 CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0 -S RTL,Super RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0 +Super RTL,S RTL;RTL World:12187:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0 VOX;RTL World:12187:hC34:S19.2E:27500:167:136=deu:71:0:12060:1:1089:0 KABEL1;ProSiebenSat.1:12480:vC34:S19.2E:27500:511:512=deu:33:0:899:133:33:0 -NEUN LIVE,NEUN LIVE Television;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:35:0:897:133:33:0 +NEUN LIVE Television,NEUN LIVE;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:35:0:897:133:33:0 DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:0:0:900:133:33:0 HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0 Bloomberg TV Germany;Bloomberg:12551:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0 @@ -44,23 +44,23 @@ ZDFdokukanal;ZDFvision:11953:hC34:S19.2E:27500:660:670=deu:130:0:28014:1:1079:0 MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0 rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0 :Premiere World -START,PREMIERE START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0 -PREM 1,PREMIERE 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu;515=deu:32:1702,1801,1722:10:133:2:0 -PREM 2,PREMIERE 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu;1795=deu:32:1702,1722,1801:11:133:2:0 -PREM 3,PREMIERE 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0 -PREM 4,PREMIERE 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0 -PREM 5,PREMIERE 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu:32:1722,1702,1801:29:133:2:0 -PREM 6,PREMIERE 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0 -PREM 7,PREMIERE 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:20:133:2:0 -DISNEY,DISNEY CHANNEL;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1702,1801:34:133:17:0 +PREMIERE START,START;PREMIERE:11797:hC34:S19.2E:27500:255:256=deu:32:1702,1801,1722:8:133:2:0 +PREMIERE 1,PREM 1;PREMIERE:11797:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1702,1801,1722:10:133:2:0 +PREMIERE 2,PREM 2;PREMIERE:11797:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1702,1722,1801:11:133:2:0 +PREMIERE 3,PREM 3;PREMIERE:11797:hC34:S19.2E:27500:2303:2304=deu,2305=deu:32:1722,1801,1702:43:133:2:0 +PREMIERE 4,PREM 4;PREMIERE:11797:hC34:S19.2E:27500:767:768=deu,769=deu:32:1801,1722,1702:9:133:2:0 +PREMIERE 5,PREM 5;PREMIERE:11797:hC34:S19.2E:27500:1279:1280=deu,1281=deu:32:1722,1702,1801:29:133:2:0 +PREMIERE 6,PREM 6;PREMIERE:11797:hC34:S19.2E:27500:1535:1536=deu:32:1702,1722,1801:41:133:2:0 +PREMIERE 7,PREM 7;PREMIERE:11797:hC34:S19.2E:27500:1023:1024=deu:32:1722,1702,1801:20:133:2:0 +DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:0:1722,1702,1801:34:133:17:0 :Premiere Direkt -DIREKT,PREMIERE DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0 +PREMIERE DIREKT,DIREKT;PREMIERE:12031:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0 :PW Erotic -B-UHSE,BEATE-UHSE.TV;PREMIERE:12070:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:21:133:1:0 -EROTIK,DIREKT EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1702,1801:513:133:4:0 +BEATE-UHSE.TV,B-UHSE;PREMIERE:12070:hC34:S19.2E:27500:1023:1024=deu:32:1801,1702,1722:21:133:1:0 +DIREKT EROTIK,EROTIK;PREMIERE:12031:hC34:S19.2E:27500:1279:0:0:1722,1702,1801:513:133:4:0 :Sportsworld -Konferenz:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1801,1702,1722:17:133:3:0 -Formel 1:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1702,1722,1801:27:133:4:0 +PREMIERE SPORT 1,SPORT 1;PREMIERE:11719:hC34:S19.2E:27500:255:256=deu,257=deu:32:1801,1702,1722:17:133:3:0 +PREMIERE SPORT 2,SPORT 2;PREMIERE:12031:hC34:S19.2E:27500:3839:3840=deu,3841=deu:32:1722,1702,1801:27:133:4:0 :Beta Digital N24;ProSiebenSat.1:12480:vC34:S19.2E:27500:2047:2048=deu:36:0:47:133:33:0 Liberty TV.com;Maastricht Multimedia:12610:vC56:S19.2E:22000:941:943=deu:0:0:12199:1:1112:0 @@ -94,7 +94,7 @@ Sky Mix;BSkyB:12226:hC23:S28.2E:27500:2314+2304:2315=eng,2316=NAR:2317:960,961:5 ITV2;BSkyB:10906:vC56:S28.2E:22000:2350:2351=eng,2352=eng:2353:960,961:10240:2:2054:0 Sci-Fi;BSkyB:12148:hC23:S28.2E:27500:2314+2304:2315=eng:2316:960,961:4905:2:2023:0 Paramount;BSkyB:12187:hC23:S28.2E:27500:2313+2304:2314=eng:2315:960,961:5904:2:2025:0 -Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng:2305:960,961:6201:2:2009:0 +Discovery;BSkyB:11875:hC23:S28.2E:27500:2304:2306=eng,2307=NAR:2305:960,961:6201:2:2009:0 Sky Movies 1;BSkyB:11836:hC23:S28.2E:27500:2310+2304:2311=eng,2312=NAR;2314=eng:2313:960,961:4303:2:2007:0 Sky Movies 2;BSkyB:11836:hC23:S28.2E:27500:2305+2304:2306=eng,2307=NAR;2309=eng:2308:960,961:4302:2:2007:0 Sky Movies 3;BSkyB:11836:hC23:S28.2E:27500:2315+2304:2316=eng,2317=NAR;2319=eng:2318:960,961:4403:2:2007:0 -- cgit v1.2.3