From 021190e605d10424986c616793829a7e99b3e720 Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Fri, 23 Nov 2012 16:24:15 +0100 Subject: change MjdToEpochTime macro to function and use it on more locations extract SKY qualitiy info from stream. Should be added to the event description do not send already expired events to VDR so that no cleanup is required after. changed the logic of summary handling for SKY so that no SummaryAvailable bit is required, since it can not be located from the stream implement some TODOs remove commented code --- epghandler.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epghandler.c') diff --git a/epghandler.c b/epghandler.c index d6b01af..f7c821d 100644 --- a/epghandler.c +++ b/epghandler.c @@ -100,11 +100,11 @@ void cEEpgHandler::FindDuplicate(cEvent* Event, const char* newTitle) if (origDescription.empty() && origShortText.empty()) { cEvent* eqEvent = NULL; cEvent* ev = (cEvent*) Event->Next(); - if (ev && (ev->EventID() == Event->EventID() || strcasecmp(ev->Title(), newTitle) == 0) + if (ev && (ev->EventID() == Event->EventID() || (newTitle && strcasecmp(ev->Title(), newTitle) == 0)) && Event->StartTime() <= ev->StartTime() && Event->EndTime() > ev->StartTime()) eqEvent = ev; if (!eqEvent && (ev = (cEvent*) Event->Prev()) != NULL - && (ev->EventID() == Event->EventID() || strcasecmp(ev->Title(), newTitle) == 0) + && (ev->EventID() == Event->EventID() || (newTitle && strcasecmp(ev->Title(), newTitle) == 0)) && ev->StartTime() <= Event->StartTime() && ev->EndTime() > Event->StartTime()) eqEvent = ev; if (eqEvent) { @@ -113,7 +113,7 @@ void cEEpgHandler::FindDuplicate(cEvent* Event, const char* newTitle) if (ev->ShortText() && strcmp(ev->ShortText(), "") != 0) origShortText = ev->ShortText(); - LogD(0, prep("!!!Deleting Event id o:%d n:%d; title o:%s n:%d; start_time o:%d n:%d; duration o:%d n:%d"), + LogD(0, prep("!!!Deleting Event id o:%d n:%d; title o:%s n:%s; start_time o:%d n:%d; duration o:%d n:%d"), ev->EventID(), Event->EventID(), ev->Title(), newTitle, ev->StartTime(), Event->StartTime(), ev->Duration(), Event->Duration()); schedule->DelEvent((cEvent*) eqEvent); -- cgit v1.2.3