From 09a17d56e2a3f975a0467e8da4ca26c946b6ccf7 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 31 Jan 2010 15:42:00 +0100 Subject: =?UTF-8?q?Version=201.7.12=20-=20Changed=20the=20EVCONTENTMASK=5F?= =?UTF-8?q?*=20macros=20to=20enums=20and=20changed=20"mask"=20to=20"group"?= =?UTF-8?q?.=20-=20Updated=20the=20Estonian=20OSD=20texts=20(thanks=20to?= =?UTF-8?q?=20Arthur=20Konovalov).=20-=20The=20"Edit=20timer"=20menu=20can?= =?UTF-8?q?=20now=20set=20the=20folder=20for=20the=20recording=20from=20a?= =?UTF-8?q?=20list=20of=20=20=20folders=20stored=20in=20"folders.conf".=20?= =?UTF-8?q?-=20Updated=20the=20Italian=20OSD=20texts=20(thanks=20to=20Dieg?= =?UTF-8?q?o=20Pierotto).=20-=20If=20svdrphosts.conf=20contains=20only=20t?= =?UTF-8?q?he=20address=20of=20the=20local=20host,=20the=20SVDRP=20port=20?= =?UTF-8?q?=20=20is=20opened=20only=20for=20the=20local=20host=20(thanks?= =?UTF-8?q?=20to=20Manuel=20Reimer).=20-=20Renamed=20'runvdr'=20to=20'runv?= =?UTF-8?q?dr.template'=20and=20no=20longer=20copying=20it=20to=20the=20BI?= =?UTF-8?q?NDIR=20=20=20in=20'make=20install'=20(thanks=20to=20Martin=20Da?= =?UTF-8?q?uskardt).=20-=20Added=20plain=20text=20error=20messages=20to=20?= =?UTF-8?q?log=20entries=20from=20cOsd::SetAreas()=20(suggested=20=20=20by?= =?UTF-8?q?=20Rolf=20Ahrenberg).=20-=20cPalette::ClosestColor()=20now=20tr?= =?UTF-8?q?eats=20fully=20transparent=20colors=20as=20"equal";=20improved?= =?UTF-8?q?=20=20=20cDvbSpuBitmap::getMinBpp()=20(thanks=20to=20Matthieu?= =?UTF-8?q?=20Castet=20and=20Johann=20Friedrichs).=20-=20The=20new=20setup?= =?UTF-8?q?=20option=20"Miscellaneous/Channels=20wrap"=20controls=20whethe?= =?UTF-8?q?r=20the=20current=20=20=20channel=20wraps=20around=20the=20begi?= =?UTF-8?q?nning=20or=20end=20of=20the=20channel=20list=20when=20zapping?= =?UTF-8?q?=20(thanks=20=20=20to=20Matti=20Lehtim=C3=A4ki).=20-=20Fixed=20?= =?UTF-8?q?determining=20the=20frame=20duration=20on=20channels=20where=20?= =?UTF-8?q?the=20PTS=20deltas=20jitter=20by=20=20=20+/-1=20around=201800.?= =?UTF-8?q?=20-=20The=20PCR=20pid=20in=20generated=20PMTs=20is=20now=20set?= =?UTF-8?q?=20to=20the=20channel's=20PCR=20pid=20again.=20-=20Fixed=20dete?= =?UTF-8?q?rmining=20the=20frame=20duration=20on=20channels=20where=20the?= =?UTF-8?q?=20PTS=20deltas=20jitter=20by=20=20=20+/-1=20around=203600.=20-?= =?UTF-8?q?=20The=20PCR=20pid=20is=20now=20recorded=20for=20channels=20whe?= =?UTF-8?q?re=20this=20is=20different=20from=20the=20video=20=20=20PID.=20?= =?UTF-8?q?To=20facilitate=20this,=20the=20interfaces=20of=20cTransfer,=20?= =?UTF-8?q?cTransferControl,=20cRecorder=20=20=20and=20cReceiver=20have=20?= =?UTF-8?q?been=20modified,=20so=20that=20the=20PIDs=20are=20no=20longer?= =?UTF-8?q?=20given=20in=20separate=20=20=20parameters,=20but=20rather=20t?= =?UTF-8?q?he=20whole=20channel=20is=20handed=20down=20for=20processing.?= =?UTF-8?q?=20The=20old=20=20=20constructor=20of=20cReceiver=20is=20still?= =?UTF-8?q?=20available,=20but=20it=20is=20recommended=20to=20plugin=20aut?= =?UTF-8?q?hors=20=20=20that=20they=20switch=20to=20the=20new=20interface?= =?UTF-8?q?=20as=20soon=20as=20possible.=20=20=20When=20replaying=20such?= =?UTF-8?q?=20a=20recording,=20the=20PCR=20packets=20are=20sent=20to=20Pla?= =?UTF-8?q?yTsVideo()=20-=20The=20files=20"commands.conf"=20and=20"reccmd.?= =?UTF-8?q?conf"=20can=20now=20contain=20nested=20lists=20of=20=20=20comma?= =?UTF-8?q?nds.=20See=20vdr.5=20for=20information=20about=20the=20new=20fi?= =?UTF-8?q?le=20format.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epg.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'epg.c') diff --git a/epg.c b/epg.c index e1cfe18..006a5de 100644 --- a/epg.c +++ b/epg.c @@ -7,7 +7,7 @@ * Original version (as used in VDR before 1.3.0) written by * Robert Schneider and Rolf Hakenes . * - * $Id: epg.c 2.4 2010/01/03 14:10:20 kls Exp $ + * $Id: epg.c 2.5 2010/01/08 15:20:28 kls Exp $ */ #include "epg.h" @@ -190,7 +190,7 @@ void cEvent::SetComponents(cComponents *Components) void cEvent::SetContents(uchar *Contents) { - for (int i = 0; i < MAXEVCONTENTS; i++) + for (int i = 0; i < MaxEventContents; i++) contents[i] = Contents[i]; } @@ -250,7 +250,7 @@ bool cEvent::IsRunning(bool OrAboutToStart) const const char *cEvent::ContentToString(uchar Content) { switch (Content & 0xF0) { - case EVCONTENTMASK_MOVIEDRAMA: + case ecgMovieDrama: switch (Content & 0x0F) { default: case 0x00: return tr("Content$Movie/Drama"); @@ -264,7 +264,7 @@ const char *cEvent::ContentToString(uchar Content) case 0x08: return tr("Content$Adult Movie/Drama"); } break; - case EVCONTENTMASK_NEWSCURRENTAFFAIRS: + case ecgNewsCurrentAffairs: switch (Content & 0x0F) { default: case 0x00: return tr("Content$News/Current Affairs"); @@ -274,7 +274,7 @@ const char *cEvent::ContentToString(uchar Content) case 0x04: return tr("Content$Discussion/Inverview/Debate"); } break; - case EVCONTENTMASK_SHOW: + case ecgShow: switch (Content & 0x0F) { default: case 0x00: return tr("Content$Show/Game Show"); @@ -283,7 +283,7 @@ const char *cEvent::ContentToString(uchar Content) case 0x03: return tr("Content$Talk Show"); } break; - case EVCONTENTMASK_SPORTS: + case ecgSports: switch (Content & 0x0F) { default: case 0x00: return tr("Content$Sports"); @@ -300,7 +300,7 @@ const char *cEvent::ContentToString(uchar Content) case 0x0B: return tr("Content$Martial Sports"); } break; - case EVCONTENTMASK_CHILDRENYOUTH: + case ecgChildrenYouth: switch (Content & 0x0F) { default: case 0x00: return tr("Content$Children's/Youth Programme"); @@ -311,7 +311,7 @@ const char *cEvent::ContentToString(uchar Content) case 0x05: return tr("Content$Cartoons/Puppets"); } break; - case EVCONTENTMASK_MUSICBALLETDANCE: + case ecgMusicBalletDance: switch (Content & 0x0F) { default: case 0x00: return tr("Content$Music/Ballet/Dance"); @@ -323,7 +323,7 @@ const char *cEvent::ContentToString(uchar Content) case 0x06: return tr("Content$Ballet"); } break; - case EVCONTENTMASK_ARTSCULTURE: + case ecgArtsCulture: switch (Content & 0x0F) { default: case 0x00: return tr("Content$Arts/Culture"); @@ -340,7 +340,7 @@ const char *cEvent::ContentToString(uchar Content) case 0x0B: return tr("Content$Fashion"); } break; - case EVCONTENTMASK_SOCIALPOLITICALECONOMICS: + case ecgSocialPoliticalEconomics: switch (Content & 0x0F) { default: case 0x00: return tr("Content$Social/Political/Economics"); @@ -349,7 +349,7 @@ const char *cEvent::ContentToString(uchar Content) case 0x03: return tr("Content$Remarkable People"); } break; - case EVCONTENTMASK_EDUCATIONALSCIENCE: + case ecgEducationalScience: switch (Content & 0x0F) { default: case 0x00: return tr("Content$Education/Science/Factual"); @@ -362,7 +362,7 @@ const char *cEvent::ContentToString(uchar Content) case 0x07: return tr("Content$Languages"); } break; - case EVCONTENTMASK_LEISUREHOBBIES: + case ecgLeisureHobbies: switch (Content & 0x0F) { default: case 0x00: return tr("Content$Leisure/Hobbies"); @@ -375,7 +375,7 @@ const char *cEvent::ContentToString(uchar Content) case 0x07: return tr("Content$Gardening"); } break; - case EVCONTENTMASK_SPECIAL: + case ecgSpecial: switch (Content & 0x0F) { case 0x00: return tr("Content$Original Language"); case 0x01: return tr("Content$Black & White"); @@ -468,7 +468,7 @@ bool cEvent::Parse(char *s) break; case 'G': { memset(contents, 0, sizeof(contents)); - for (int i = 0; i < MAXEVCONTENTS; i++) { + for (int i = 0; i < MaxEventContents; i++) { char *tail = NULL; int c = strtol(t, &tail, 16); if (0x00 < c && c <= 0xFF) { -- cgit v1.2.3