X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/241539994d770f2ee9d0c0ec4bd773d8ea696ad9..c797d4040a1dfac3873b481111a84a5c557432f3:/lib/dvb/epgcache.h diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h index 98a38451..5e5e7e8e 100644 --- a/lib/dvb/epgcache.h +++ b/lib/dvb/epgcache.h @@ -204,7 +204,7 @@ class eEPGCache: public eMainloop, private eThread, public Object void abortEPG(); void abortNonAvail(); }; - void FixOverlapping(std::pair &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service); + bool FixOverlapping(std::pair &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service); public: enum {PRIVATE=0, NOWNEXT=1, SCHEDULE=2, SCHEDULE_OTHER=4 #ifdef ENABLE_MHW_EPG @@ -309,9 +309,9 @@ public: #ifndef SWIG // eventData's are plain entrys out of the cache.. it's not safe to use them after cache unlock // but its faster in use... its not allowed to delete this pointers via delete or free.. - SWIG_VOID(RESULT) lookupEventId(const eServiceReference &service, int event_id, const eventData *&SWIG_OUTPUT); - SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, const eventData *&SWIG_OUTPUT, int direction=0); - SWIG_VOID(RESULT) getNextTimeEntry(const eventData *&SWIG_OUTPUT); + RESULT lookupEventId(const eServiceReference &service, int event_id, const eventData *&); + RESULT lookupEventTime(const eServiceReference &service, time_t, const eventData *&, int direction=0); + RESULT getNextTimeEntry(const eventData *&); // eit_event_struct's are plain dvb eit_events .. it's not safe to use them after cache unlock // its not allowed to delete this pointers via delete or free..