From 5d8e3b18dc610e2696606092ba66e1477eccce88 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 14 May 2006 18:00:00 +0200 Subject: =?UTF-8?q?Version=201.4.0-1=20-=20Updated=20'S110W'=20in=20'sourc?= =?UTF-8?q?es.conf'.=20-=20Adjusted=20the=20'runvdr'=20script=20so=20that?= =?UTF-8?q?=20the=20user=20can=20fill=20in=20the=20functions=20to=20=20=20?= =?UTF-8?q?detect,=20load=20and=20unload=20the=20necessary=20driver=20modu?= =?UTF-8?q?les=20(thanks=20to=20M.=20Kiesel=20for=20=20=20reporting=20that?= =?UTF-8?q?=20it=20still=20used=20DVBDIR).=20-=20Added=20'eval'=20to=20the?= =?UTF-8?q?=20$VDRCMD=20call=20in=20'runvdr'=20to=20avoid=20problems=20wit?= =?UTF-8?q?h=20quoting=20=20=20(suggested=20by=20Udo=20Richter).=20-=20Fix?= =?UTF-8?q?ed=20missing=20','=20in=20the=20Italian=20and=20Polish=20OSD=20?= =?UTF-8?q?texts=20(thanks=20to=20Marko=20M=C3=A4kel=C3=A4).=20-=20Updated?= =?UTF-8?q?=20the=20Czech=20OSD=20texts=20(thanks=20to=20Vladim=C3=ADr=20B?= =?UTF-8?q?=C3=A1rta).=20-=20Fixed=20handling=20the=20"Power"=20key=20in?= =?UTF-8?q?=20case=20a=20timer=20is=20about=20to=20start=20recording=20=20?= =?UTF-8?q?=20(thanks=20to=20Udo=20Richter).=20-=20Fixed=20the=20character?= =?UTF-8?q?=20'r'=20in=20fontosd=20and=20fontsml=20for=20iso8859-2=20(than?= =?UTF-8?q?ks=20to=20Vladim=C3=ADr=20=20=20B=C3=A1rta).=20-=20When=20check?= =?UTF-8?q?ing=20whether=20a=20VPS=20timer=20has=20entered=20the=20"VPS=20?= =?UTF-8?q?margin",=20the=20event's=20start=20=20=20time=20is=20now=20used?= =?UTF-8?q?=20instead=20of=20the=20timer's=20start=20time,=20because=20oth?= =?UTF-8?q?erwise=20events=20that=20=20=20start=20way=20off=20of=20their?= =?UTF-8?q?=20VPS=20time=20wouldn't=20be=20recorded=20correctly.=20-=20If?= =?UTF-8?q?=20VPS=20timers=20are=20active,=20their=20events=20are=20now=20?= =?UTF-8?q?being=20kept=20up=20to=20date=20if=20there=20=20=20are=20any=20?= =?UTF-8?q?free=20devices=20available.=20-=20Fixed=20the=20character=20#20?= =?UTF-8?q?7=20in=20fontosd=20for=20iso8859-2=20(thanks=20to=20Vladim?= =?UTF-8?q?=C3=ADr=20B=C3=A1rta).=20-=20Fixed=20handling=20unknown=20codes?= =?UTF-8?q?=20when=20learning=20LIRC=20remote=20control=20codes=20(reporte?= =?UTF-8?q?d=20=20=20by=20Helmut=20Auer).=20-=20Since=20some=20channels=20?= =?UTF-8?q?(especially=20the=20Austrian=20ORF)=20randomly=20change=20the?= =?UTF-8?q?=20ids=20of=20their=20=20=20EPG=20events,=20VDR=20now=20gives?= =?UTF-8?q?=20the=20start=20time=20precedence=20when=20searching=20for=20e?= =?UTF-8?q?xisting=20=20=20events.=20-=20Fixed=20automatically=20updating?= =?UTF-8?q?=20the=20CAM=20menu=20in=20case=20the=20whole=20operation=20(fo?= =?UTF-8?q?r=20=20=20instance=20a=20firmware=20update)=20takes=20longer=20?= =?UTF-8?q?than=20the=20menu=20timeout.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epg.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'epg.c') diff --git a/epg.c b/epg.c index bc448cf..96c43e5 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 1.72 2006/04/22 12:02:47 kls Exp $ + * $Id: epg.c 1.74 2006/05/12 13:25:44 kls Exp $ */ #include "epg.h" @@ -327,8 +327,10 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule) cEvent *newEvent = NULL; if (Event) DELETENULL(Event->components); - if (!Event) + if (!Event) { Event = newEvent = new cEvent(EventID); + Event->seen = 0; + } if (Event) { Event->SetTableID(TableID); Event->SetStartTime(StartTime); @@ -710,12 +712,12 @@ const cEvent *cSchedule::GetFollowingEvent(void) const const cEvent *cSchedule::GetEvent(tEventID EventID, time_t StartTime) const { - // Returns either the event info with the given EventID or, if that one can't - // be found, the one with the given StartTime (or NULL if neither can be found) - cEvent *pt = eventsHashID.Get(EventID); - if (!pt && StartTime > 0) // 'StartTime < 0' is apparently used with NVOD channels - pt = eventsHashStartTime.Get(StartTime); - return pt; + // Returns the event info with the given StartTime or, if no actual StartTime + // is given, the one with the given EventID. + if (StartTime > 0) // 'StartTime < 0' is apparently used with NVOD channels + return eventsHashStartTime.Get(StartTime); + else + return eventsHashID.Get(EventID); } const cEvent *cSchedule::GetEventAround(time_t Time) const -- cgit v1.2.3