diff options
Diffstat (limited to 'epg.c')
| -rw-r--r-- | epg.c | 35 |
1 files changed, 21 insertions, 14 deletions
@@ -7,7 +7,7 @@ * Original version (as used in VDR before 1.3.0) written by * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * - * $Id: epg.c 2.9 2012/01/12 14:31:46 kls Exp $ + * $Id: epg.c 2.11 2012/02/13 14:58:19 kls Exp $ */ #include "epg.h" @@ -424,7 +424,7 @@ cString cEvent::GetVpsString(void) const { char buf[25]; struct tm tm_r; - strftime(buf, sizeof(buf), "%d.%m %R", localtime_r(&vps, &tm_r)); + strftime(buf, sizeof(buf), "%d.%m. %R", localtime_r(&vps, &tm_r)); return buf; } @@ -587,7 +587,7 @@ void ReportEpgBugFixStats(bool Reset) bool GotHits = false; char buffer[1024]; for (int i = 0; i < MAXEPGBUGFIXSTATS; i++) { - const char *delim = "\t"; + const char *delim = " "; tEpgBugFixStats *p = &EpgBugFixStats[i]; if (p->hits) { bool PrintedStats = false; @@ -604,11 +604,11 @@ void ReportEpgBugFixStats(bool Reset) dsyslog("CHANNELS READS THIS: PLEASE TAKE A LOOK AT THE FUNCTION cEvent::FixEpgBugs()"); dsyslog("IN VDR/epg.c TO LEARN WHAT'S WRONG WITH YOUR DATA, AND FIX IT!"); dsyslog("====================="); - dsyslog("Fix\tHits\tChannels"); + dsyslog("Fix Hits Channels"); GotHits = true; } if (!PrintedStats) { - q += snprintf(q, sizeof(buffer) - (q - buffer), "%d\t%d", i, p->hits); + q += snprintf(q, sizeof(buffer) - (q - buffer), "%-3d %-4d", i, p->hits); PrintedStats = true; } q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->Name()); @@ -1029,15 +1029,10 @@ void cSchedule::Cleanup(void) void cSchedule::Cleanup(time_t Time) { - cEvent *Event = events.First(); - while (Event) { - if (Event->HasTimer()) - Event = (cEvent *)Event->Next(); - else if (Event->EndTime() + Setup.EPGLinger * 60 + 3600 < Time) { // adding one hour for safety - cEvent *e = Event; - Event = (cEvent *)Event->Next(); - DelEvent(e); - } + cEvent *Event; + while ((Event = events.First()) != NULL) { + if (!Event->HasTimer() && Event->EndTime() + Setup.EPGLinger * 60 + 3600 < Time) // adding one hour for safety + DelEvent(Event); else break; } @@ -1289,3 +1284,15 @@ const cSchedule *cSchedules::GetSchedule(const cChannel *Channel, bool AddIfMiss } return Channel->schedule != &DummySchedule? Channel->schedule : NULL; } + +// --- cEpgDataReader -------------------------------------------------------- + +cEpgDataReader::cEpgDataReader(void) +:cThread("epg data reader") +{ +} + +void cEpgDataReader::Action(void) +{ + cSchedules::Read(); +} |