X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5bff4bdd4a2877410b8e6daa070641fed1ab8ce1..d87e3beb37390b59d288ae1cb43d9f887754ed56:/lib/dvb/epgcache.h

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index e5dd148b..5e5e7e8e 100644
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -177,7 +177,7 @@ class eEPGCache: public eMainloop, private eThread, public Object
 		std::vector<mhw_channel_name_t> m_channels;
 		std::map<__u8, mhw_theme_name_t> m_themes;
 		std::map<__u32, mhw_title_t> m_titles;
-		std::map<__u32, __u32> m_program_ids;
+		std::multimap<__u32, __u32> m_program_ids;
 		ePtr<eConnection> m_MHWConn, m_MHWConn2;
 		ePtr<iDVBSectionReader> m_MHWReader, m_MHWReader2;
 		eDVBSectionFilterMask m_MHWFilterMask, m_MHWFilterMask2;
@@ -204,7 +204,7 @@ class eEPGCache: public eMainloop, private eThread, public Object
 		void abortEPG();
 		void abortNonAvail();
 	};
-	void FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service);
+	bool FixOverlapping(std::pair<eventMap,timeMap> &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..