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

Reduced the time window within EPG events are checked

Browse Source
This commit is contained in:
Klaus Schmidinger 2005-03-20 13:13:02 +01:00
parent 14a38b1dba
commit 5d17dc3fdc
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
timers.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: timers.c 1.27 2005/03/20 13:12:07 kls Exp $ * $Id: timers.c 1.28 2005/03/20 13:13:02 kls Exp $
*/ */
#include "timers.h" #include "timers.h"
@ -369,6 +369,11 @@ bool cTimer::Matches(time_t t, bool Directly) const
int cTimer::Matches(const cEvent *Event, int *Overlap) int cTimer::Matches(const cEvent *Event, int *Overlap)
{ {
// Overlap is the percentage of the Event's duration that is covered by
// this timer (based on FULLMATCH for finer granularity than just 100).
// To make sure a VPS timer can be distinguished from a plain 100% overlap,
// it gets an additional 100 added, and a VPS event that is actually running
// gets 200 added to the FULLMATCH.
if (HasFlags(tfActive) && channel->GetChannelID() == Event->ChannelID()) { if (HasFlags(tfActive) && channel->GetChannelID() == Event->ChannelID()) {
bool UseVps = HasFlags(tfVps) && Event->Vps(); bool UseVps = HasFlags(tfVps) && Event->Vps();
Matches(UseVps ? Event->Vps() : Event->StartTime(), true); Matches(UseVps ? Event->Vps() : Event->StartTime(), true);
@ -558,7 +563,8 @@ bool cTimers::Modified(void)
return Result; return Result;
} }
#define EPGLIMIT (12 * 3600) // time in seconds around now, within which EPG events will be taken into consideration #define EPGLIMITPAST (2 * 3600) // time in seconds around now, within which EPG events will be taken into consideration
#define EPGLIMITFUTURE (4 * 3600)
void cTimers::SetEvents(void) void cTimers::SetEvents(void)
{ {
@ -579,9 +585,9 @@ void cTimers::SetEvents(void)
for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) { for (const cEvent *e = Schedule->Events()->First(); e; e = Schedule->Events()->Next(e)) {
if (cRemote::HasKeys()) if (cRemote::HasKeys())
return; // react immediately on user input return; // react immediately on user input
if (e->EndTime() < now - EPGLIMIT) if (e->EndTime() < now - EPGLIMITPAST)
continue; // skip old events continue; // skip old events
if (e->StartTime() > now + EPGLIMIT) if (e->StartTime() > now + EPGLIMITFUTURE)
break; // no need to process events too far in the future break; // no need to process events too far in the future
int overlap = 0; int overlap = 0;
ti->Matches(e, &overlap); ti->Matches(e, &overlap);