X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/241539994d770f2ee9d0c0ec4bd773d8ea696ad9..0c59a4279f93f08fe95fca5f2e55f3e025f0cceb:/lib/dvb/epgcache.h

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index 98a38451..fc42ded5 100644
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -155,7 +155,7 @@ class eEPGCache: public eMainloop, private eThread, public Object
 		pthread_mutex_t channel_active;
 		channel_data(eEPGCache*);
 		eEPGCache *cache;
-		eTimer abortTimer, zapTimer;
+		ePtr<eTimer> abortTimer, zapTimer;
 		int prevChannelState;
 		__u8 state, isRunning, haveData;
 		ePtr<eDVBChannel> channel;
@@ -163,7 +163,7 @@ class eEPGCache: public eMainloop, private eThread, public Object
 		ePtr<iDVBSectionReader> m_NowNextReader, m_ScheduleReader, m_ScheduleOtherReader;
 		tidMap seenSections[3], calcedSections[3];
 #ifdef ENABLE_PRIVATE_EPG
-		eTimer startPrivateTimer;
+		ePtr<eTimer> startPrivateTimer;
 		int m_PrevVersion;
 		int m_PrivatePid;
 		uniqueEPGKey m_PrivateService;
@@ -181,7 +181,7 @@ class eEPGCache: public eMainloop, private eThread, public Object
 		ePtr<eConnection> m_MHWConn, m_MHWConn2;
 		ePtr<iDVBSectionReader> m_MHWReader, m_MHWReader2;
 		eDVBSectionFilterMask m_MHWFilterMask, m_MHWFilterMask2;
-		eTimer m_MHWTimeoutTimer;
+		ePtr<eTimer> m_MHWTimeoutTimer;
 		bool m_MHWTimeoutet;
 		void MHWTimeout() { m_MHWTimeoutet=true; }
 		void readMHWData(const __u8 *data);
@@ -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
@@ -249,7 +249,7 @@ private:
 	friend class channel_data;
 	static eEPGCache *instance;
 
-	eTimer cleanTimer;
+	ePtr<eTimer> cleanTimer;
 	std::map<iDVBChannel*, channel_data*> m_knownChannels;
 	ePtr<eConnection> m_chanAddedConn;
 
@@ -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..