diff options
| author | Dimitar Petrovski <dimeptr@gmail.com> | 2012-11-23 16:24:15 +0100 |
|---|---|---|
| committer | Dimitar Petrovski <dimeptr@gmail.com> | 2012-11-23 16:24:15 +0100 |
| commit | 021190e605d10424986c616793829a7e99b3e720 (patch) | |
| tree | 3bd9d25b8462073a134125d10980d6859c166ea0 /epghandler.c | |
| parent | e806e6ac89fa61fc6683bb14ac73d3173450226a (diff) | |
| download | vdr-plugin-eepg-021190e605d10424986c616793829a7e99b3e720.tar.gz vdr-plugin-eepg-021190e605d10424986c616793829a7e99b3e720.tar.bz2 | |
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
Diffstat (limited to 'epghandler.c')
| -rw-r--r-- | epghandler.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |