From fe9499ba901f5c32dd0b3841a2b6e599fefc144f Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 24 Nov 2002 18:00:00 +0100 Subject: =?UTF-8?q?Version=201.1.17=20-=20Added=20new=20entries=20to=20'ca?= =?UTF-8?q?.conf'.=20-=20Fixed=20closing=20unused=20PID=20handles=20(thank?= =?UTF-8?q?s=20to=20Stefan=20Schluenss=20for=20reporting=20this=20=20=20on?= =?UTF-8?q?e).=20-=20Added=20more=20examples=20to=20'diseqc.conf'=20(thank?= =?UTF-8?q?s=20to=20Oliver=20Endriss).=20-=20Fixed=20disabling=20multiple?= =?UTF-8?q?=20recordings=20on=20a=20single=20DVB=20card=20(comment=20out?= =?UTF-8?q?=20the=20definition=20=20=20of=20the=20macros=20DO=5FREC=5FAND?= =?UTF-8?q?=5FPLAY=5FON=5FPRIMARY=5FDEVICE=20and=20DO=5FMULTIPLE=5FRECORDI?= =?UTF-8?q?NGS=20in=20=20=20dvbdevice.c).=20-=20Plugins=20can=20now=20have?= =?UTF-8?q?=20their=20very=20own=20OSD=20setup=20in=20the=20object=20they?= =?UTF-8?q?=20return=20from=20=20=20a=20call=20to=20cPlugin::MainMenuActio?= =?UTF-8?q?n().=20In=20order=20to=20implement=20this,=20the=20return=20typ?= =?UTF-8?q?e=20=20=20of=20cPlugin::MainMenuAction()=20had=20to=20be=20chan?= =?UTF-8?q?ged=20from=20(cOsdMenu=20*)=20to=20(cOsdObject=20*).=20=20=20So?= =?UTF-8?q?=20in=20case=20you=20are=20compiling=20an=20existing=20plugin?= =?UTF-8?q?=20with=20this=20version=20of=20VDR=20and=20you=20=20=20get=20a?= =?UTF-8?q?n=20error=20message,=20simply=20change=20cOsdMenu=20to=20cOsdOb?= =?UTF-8?q?ject=20in=20the=20plugin's=20source=20=20=20for=20the=20MainMen?= =?UTF-8?q?uAction()=20function.=20=20=20Plugin=20authors=20who=20have=20s?= =?UTF-8?q?o=20far=20(ab)used=20the=20cControl=20mechanism=20to=20implemen?= =?UTF-8?q?t=20their=20=20=20own=20raw=20OSD=20should=20take=20a=20look=20?= =?UTF-8?q?at=20the=20new=20demo=20plugin=20'osddemo'.=20It=20implements?= =?UTF-8?q?=20=20=20a=20very=20primitive=20game=20that=20shows=20how=20a?= =?UTF-8?q?=20plugin=20can=20have=20its=20own=20raw=20OSD.=20Especially=20?= =?UTF-8?q?=20=20look=20into=20cLineGame=20and=20see=20how=20it=20implemen?= =?UTF-8?q?ts=20the=20Show()=20function.=20See=20also=20=20=20the=20chapte?= =?UTF-8?q?r=20on=20"User=20interaction"=20in=20PLUGINS.html.=20-=20Added?= =?UTF-8?q?=20three=20new=20fields=20to=20the=20lines=20in=20'channels.con?= =?UTF-8?q?f':=20NID,=20TID=20and=20RID.=20NID=20and=20=20=20TID=20are=20t?= =?UTF-8?q?he=20Network=20and=20Transport=20Stream=20IDs,=20respectively.?= =?UTF-8?q?=20RID=20is=20an=20additional=20ID=20=20=20that=20can=20be=20us?= =?UTF-8?q?ed=20to=20tell=20apart=20channels=20that=20would=20otherwise=20?= =?UTF-8?q?be=20indistinguishable.=20=20=20This=20is=20typically=20the=20c?= =?UTF-8?q?ase=20with=20radio=20channels,=20which=20may=20have=20the=20sam?= =?UTF-8?q?e=20NID,=20TID=20=20=20and=20SID,=20but=20different=20"radio=20?= =?UTF-8?q?IDs".=20This=20new=20field=20is=20therefore=20called=20RID=20("?= =?UTF-8?q?radio=20=20=20ID").=20Currently=20NID=20and=20TID=20are=20not?= =?UTF-8?q?=20yet=20used=20by=20VDR=20and=20should=20always=20be=200.=20Th?= =?UTF-8?q?e=20=20=20RID=20is=20actually=20used=20when=20building=20the=20?= =?UTF-8?q?"unique=20channel=20ID",=20so=20if=20you=20have=20channels=20?= =?UTF-8?q?=20=20in=20your=20'channels.conf'=20file=20that=20cause=20error?= =?UTF-8?q?=20messages=20when=20loading,=20you=20can=20set=20=20=20the=20R?= =?UTF-8?q?IDs=20of=20these=20channels=20to=20different=20values.=20=20=20?= =?UTF-8?q?When=20reading=20an=20old=20'channels.conf'=20these=20new=20fie?= =?UTF-8?q?lds=20will=20be=20automatically=20=20=20initialized=20to=200=20?= =?UTF-8?q?and=20once=20the=20file=20is=20written=20back=20to=20disk=20the?= =?UTF-8?q?y=20will=20be=20appended=20=20=20to=20the=20channel=20definitio?= =?UTF-8?q?ns.=20=20=20Thanks=20to=20R=C3=A9gis=20Bossut=20for=20pointing?= =?UTF-8?q?=20out=20that=20with=20some=20providers=20the=20channels=20can?= =?UTF-8?q?=20=20=20only=20be=20distinguished=20through=20the=20RID.=20-?= =?UTF-8?q?=20The=20"unique=20channel=20ID"=20now=20contains=20an=20option?= =?UTF-8?q?al=205th=20part=20(the=20RID).=20See=20man=20vdr(5).=20-=20Upda?= =?UTF-8?q?ted=20'channels.conf.cable'=20and=20made=20some=20channels=20un?= =?UTF-8?q?ique=20using=20the=20new=20RID=20=20=20(thanks=20to=20Andreas?= =?UTF-8?q?=20Kool=20for=20pointing=20out=20the=20problems).=20-=20Made=20?= =?UTF-8?q?some=20channels=20unique=20in=20'channels.conf.terr'=20using=20?= =?UTF-8?q?the=20new=20RID.=20-=20Extended=20the=20'-l'=20option=20to=20al?= =?UTF-8?q?low=20logging=20to=20LOG=5FLOCALn=20(n=3D0..7)=20by=20writing,?= =?UTF-8?q?=20for=20=20=20instance,=20'-l=203.7'=20(suggested=20by=20J?= =?UTF-8?q?=C3=BCrgen=20Schmidt).=20-=20Now=20deleting=20stale=20lock=20fi?= =?UTF-8?q?les=20if=20they=20have=20a=20time=20stamp=20that=20is=20outside?= =?UTF-8?q?=20the=20window=20=20=20'now=20+/-=20LOCKFILESTALETIME'.=20This?= =?UTF-8?q?=20improves=20things=20in=20cases=20where=20the=20system=20time?= =?UTF-8?q?=20=20=20makes=20far=20jumps,=20so=20that=20a=20lock=20file=20m?= =?UTF-8?q?ight=20end=20up=20with=20a=20time=20stamp=20that=20lies=20=20?= =?UTF-8?q?=20in=20the=20distant=20future=20(thanks=20to=20Oliver=20Endris?= =?UTF-8?q?s).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- channels.conf.terr | 100 ++++++++++++++++++++++++++--------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) (limited to 'channels.conf.terr') diff --git a/channels.conf.terr b/channels.conf.terr index 4187e11..f48d566 100644 --- a/channels.conf.terr +++ b/channels.conf.terr @@ -1,52 +1,52 @@ : UK channels for Crystal Palace, London -BBC ONE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:600:601,602:602:0:4164 -BBC TWO (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:610:611,612:0:2:4228 -BBC THREE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:620:621,622:0:0:4351 -BBC NEWS 24 (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:640:641:0:0:4415 -Ch 14 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2840:2841,2843:0:0:8800 -ITV 2 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2818:2819,2821:0:0:8325 -ITV 1 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:512:650,660:0:0:8261 -Channel 4 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2827:2828,2830:0:0:8384 -five (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6017:6018,6019:0:0:12866 -QVC (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6049:6050:0:0:13120 -TV Travel Shop (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6161:6162:0:0:13632 -ITV News (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6193:6194:0:0:13760 -BBC PARLMNT (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:403:0:0:16768 -BBC FOUR (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:201:401,402:0:0:16832 -BBC R5 Live (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:430:0:0:17920 -BBC 5L SportsX (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:431:0:0:17984 -BBC 6 Music (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:432:0:0:18048 -BBC 7 (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:433:0:0:18112 -1Xtra BBC (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:434:0:0:18176 -BBC Asian Net. (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:435:0:0:18240 -701 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:203:407:0:0:19456 -702 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:204:411:0:0:19520 -Sky News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:101:102,104:0:0:22080 -Sky Spts News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:22144 -Sky Travel (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:22208 -UKHistory (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:401:402,404:0:0:22272 -THE HITS (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:101:102:0:0:25664 -TMF (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:25728 -UKHomeStyle (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,306:0:0:25792 -f tn (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:25856 -Ch 44 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048 -Smash Hits! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1201:0:0:26240 -KISS (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1101:0:0:26176 -Kerrang! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1301:0:0:26304 -jazz fm (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1401:0:0:26368 -oneword (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1501:0:0:26432 -BBC World Sv (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1601:0:0:26496 -Ch 22 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048 -Ch 32 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:25984 +BBC ONE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:600:601,602:602:0:4164:0:0:0 +BBC TWO (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:610:611,612:0:2:4228:0:0:0 +BBC THREE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:620:621,622:0:0:4351:0:0:0 +BBC NEWS 24 (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:640:641:0:0:4415:0:0:0 +Ch 14 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2840:2841,2843:0:0:8800:0:0:0 +ITV 2 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2818:2819,2821:0:0:8325:0:0:0 +ITV 1 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:512:650,660:0:0:8261:0:0:0 +Channel 4 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2827:2828,2830:0:0:8384:0:0:0 +five (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6017:6018,6019:0:0:12866:0:0:0 +QVC (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6049:6050:0:0:13120:0:0:0 +TV Travel Shop (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6161:6162:0:0:13632:0:0:0 +ITV News (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6193:6194:0:0:13760:0:0:0 +BBC PARLMNT (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:403:0:0:16768:0:0:0 +BBC FOUR (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:201:401,402:0:0:16832:0:0:0 +BBC R5 Live (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:430:0:0:17920:0:0:0 +BBC 5L SportsX (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:431:0:0:17984:0:0:0 +BBC 6 Music (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:432:0:0:18048:0:0:0 +BBC 7 (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:433:0:0:18112:0:0:0 +1Xtra BBC (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:434:0:0:18176:0:0:0 +BBC Asian Net. (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:435:0:0:18240:0:0:0 +701 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:203:407:0:0:19456:0:0:0 +702 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:204:411:0:0:19520:0:0:0 +Sky News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:101:102,104:0:0:22080:0:0:0 +Sky Spts News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:22144:0:0:0 +Sky Travel (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:22208:0:0:0 +UKHistory (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:401:402,404:0:0:22272:0:0:0 +THE HITS (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:101:102:0:0:25664:0:0:0 +TMF (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:25728:0:0:0 +UKHomeStyle (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,306:0:0:25792:0:0:0 +f tn (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:25856:0:0:0 +Ch 44 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048:0:0:0 +Smash Hits! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1201:0:0:26240:0:0:0 +KISS (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1101:0:0:26176:0:0:0 +Kerrang! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1301:0:0:26304:0:0:0 +jazz fm (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1401:0:0:26368:0:0:0 +oneword (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1501:0:0:26432:0:0:0 +BBC World Sv (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1601:0:0:26496:0:0:0 +Ch 22 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048:0:0:1 +Ch 32 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:25984:0:0:0 : DVB-T Berlin Germany -PRO 7:658000:I0C23D0M16B8T8G8Y0:T:27500:305:306;307:0:0:16403 -SAT 1:658000:I0C23D0M16B8T8G8Y0:T:27500:385:386:0:0:16408 -RTL:658000:I0C23D0M16B8T8G8Y0:T:27500:337:338:0:0:16405 -RTL 2:658000:I0C23D0M16B8T8G8Y0:T:27500:353:354:0:0:16406 -Super RTL:778000:I0C23D0M16B8T8G8Y0:T:27500:433:434:0:0:16411 -VOX:778000:I0C23D0M16B8T8G8Y0:T:27500:545:546:0:0:16418 -KABEL 1:778000:I0C23D0M16B8T8G8Y0:T:27500:161:162:0:0:16394 -MTV:650000:I0C23D0M16B8T2G8Y0:T:27500:193:194:0:0:16396 -N-TV:650000:I0C23D0M16B8T2G8Y0:T:27500:273:274:0:0:16401 -N24:778000:I0C23D0M16B8T8G8Y0:T:27500:225:226:0:0:16398 -FAB:650000:I0C23D0M16B8T2G8Y0:T:27500:3073:3074:0:0:16576 +PRO 7:658000:I0C23D0M16B8T8G8Y0:T:27500:305:306;307:0:0:16403:0:0:0 +SAT 1:658000:I0C23D0M16B8T8G8Y0:T:27500:385:386:0:0:16408:0:0:0 +RTL:658000:I0C23D0M16B8T8G8Y0:T:27500:337:338:0:0:16405:0:0:0 +RTL 2:658000:I0C23D0M16B8T8G8Y0:T:27500:353:354:0:0:16406:0:0:0 +Super RTL:778000:I0C23D0M16B8T8G8Y0:T:27500:433:434:0:0:16411:0:0:0 +VOX:778000:I0C23D0M16B8T8G8Y0:T:27500:545:546:0:0:16418:0:0:0 +KABEL 1:778000:I0C23D0M16B8T8G8Y0:T:27500:161:162:0:0:16394:0:0:0 +MTV:650000:I0C23D0M16B8T2G8Y0:T:27500:193:194:0:0:16396:0:0:0 +N-TV:650000:I0C23D0M16B8T2G8Y0:T:27500:273:274:0:0:16401:0:0:0 +N24:778000:I0C23D0M16B8T8G8Y0:T:27500:225:226:0:0:16398:0:0:0 +FAB:650000:I0C23D0M16B8T2G8Y0:T:27500:3073:3074:0:0:16576:0:0:0 -- cgit v1.2.3