diff --git a/eit.c b/eit.c index 3cc097e9..c746337b 100644 --- a/eit.c +++ b/eit.c @@ -8,7 +8,7 @@ * Robert Schneider and Rolf Hakenes . * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg . * - * $Id: eit.c 2.17 2012/06/02 14:05:22 kls Exp $ + * $Id: eit.c 2.18 2012/06/04 09:48:57 kls Exp $ */ #include "eit.h" @@ -290,11 +290,6 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo channel->SetLinkChannels(LinkChannels); Modified = true; EpgHandlers.HandleEvent(pEvent); - - if (EpgHandlers.DeleteEvent(pEvent)) { - pSchedule->DelEvent(pEvent); - pEvent = NULL; - } } if (Tid == 0x4E) { if (Empty && getSectionNumber() == 0) diff --git a/epg.c b/epg.c index 8e2af140..54712cc9 100644 --- a/epg.c +++ b/epg.c @@ -7,7 +7,7 @@ * Original version (as used in VDR before 1.3.0) written by * Robert Schneider and Rolf Hakenes . * - * $Id: epg.c 2.14 2012/06/02 14:08:12 kls Exp $ + * $Id: epg.c 2.15 2012/06/04 09:49:48 kls Exp $ */ #include "epg.h" @@ -1429,15 +1429,6 @@ void cEpgHandlers::HandleEvent(cEvent *Event) } } -bool cEpgHandlers::DeleteEvent(const cEvent *Event) -{ - for (cEpgHandler *eh = First(); eh; eh = Next(eh)) { - if (eh->DeleteEvent(Event)) - return true; - } - return false; -} - void cEpgHandlers::SortSchedule(cSchedule *Schedule) { for (cEpgHandler *eh = First(); eh; eh = Next(eh)) { diff --git a/epg.h b/epg.h index fc05c222..6930fe0c 100644 --- a/epg.h +++ b/epg.h @@ -7,7 +7,7 @@ * Original version (as used in VDR before 1.3.0) written by * Robert Schneider and Rolf Hakenes . * - * $Id: epg.h 2.10 2012/06/02 14:07:51 kls Exp $ + * $Id: epg.h 2.11 2012/06/04 09:49:24 kls Exp $ */ #ifndef __EPG_H @@ -258,9 +258,6 @@ public: virtual bool HandleEvent(cEvent *Event) { return false; } ///< After all modifications of the Event have been done, the EPG handler ///< can take a final look at it. - virtual bool DeleteEvent(const cEvent *Event) { return false; } - ///< After the complete processing of the Event is finished, an EPG handler - ///< can decide that this Event shall be deleted from its schedule. virtual bool SortSchedule(cSchedule *Schedule) { return false; } ///< Sorts the Schedule after the complete table has been processed. virtual bool DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version) { return false; } @@ -283,7 +280,6 @@ public: void SetVps(cEvent *Event, time_t Vps); void FixEpgBugs(cEvent *Event); void HandleEvent(cEvent *Event); - bool DeleteEvent(const cEvent *Event); void SortSchedule(cSchedule *Schedule); void DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version); };