frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed getting the present EPG event in case none is currently 'running'

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-03-25 11:43:05 +01:00
parent 51be693f62
commit 3dd002cc2b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -4436,3 +4436,5 @@ Video Disk Recorder Revision History
disk space (reported by Jan Lenz). disk space (reported by Jan Lenz).
- Fixed handling repeating VPS timers (they stopped recording too early). - Fixed handling repeating VPS timers (they stopped recording too early).
- Timer log messages now show "VPS" if this is a VPS timer. - Timer log messages now show "VPS" if this is a VPS timer.
- Fixed getting the present EPG event in case none is currently 'running' (it
then returns the one that just ended).

6
epg.c
View File

@ -7,7 +7,7 @@
* Original version (as used in VDR before 1.3.0) written by * Original version (as used in VDR before 1.3.0) written by
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
* *
* $Id: epg.c 1.65 2006/02/28 13:56:05 kls Exp $ * $Id: epg.c 1.66 2006/03/25 11:43:00 kls Exp $
*/ */
#include "epg.h" #include "epg.h"
@ -677,8 +677,10 @@ const cEvent *cSchedule::GetPresentEvent(void) const
const cEvent *pe = NULL; const cEvent *pe = NULL;
time_t now = time(NULL); time_t now = time(NULL);
for (cEvent *p = events.First(); p; p = events.Next(p)) { for (cEvent *p = events.First(); p; p = events.Next(p)) {
if (p->StartTime() <= now && now < p->EndTime()) if (p->StartTime() <= now)
pe = p; pe = p;
else if (p->StartTime() > now + 3600)
break;
if (p->SeenWithin(RUNNINGSTATUSTIMEOUT) && p->RunningStatus() >= SI::RunningStatusPausing) if (p->SeenWithin(RUNNINGSTATUSTIMEOUT) && p->RunningStatus() >= SI::RunningStatusPausing)
return p; return p;
} }