X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/69d3f11e4bf566bc12981447c2b8cb999177b007..e7e5b70162a6e74d7ee293495635c79660e0f7a8:/lib/dvb/epgcache.h

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index 5e5e7e8e..dfd19482 100644
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -155,15 +155,15 @@ 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;
-		ePtr<eConnection> m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn;
-		ePtr<iDVBSectionReader> m_NowNextReader, m_ScheduleReader, m_ScheduleOtherReader;
-		tidMap seenSections[3], calcedSections[3];
+		ePtr<eConnection> m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn, m_ViasatConn;
+		ePtr<iDVBSectionReader> m_NowNextReader, m_ScheduleReader, m_ScheduleOtherReader, m_ViasatReader;
+		tidMap seenSections[4], calcedSections[4];
 #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);
@@ -198,6 +198,7 @@ class eEPGCache: public eMainloop, private eThread, public Object
 		void storeTitle(std::map<__u32, mhw_title_t>::iterator itTitle, std::string sumText, const __u8 *data);
 #endif
 		void readData(const __u8 *data);
+		void readDataViasat(const __u8 *data);
 		void startChannel();
 		void startEPG();
 		bool finishEPG();
@@ -210,6 +211,7 @@ public:
 #ifdef ENABLE_MHW_EPG
 	,MHW=8
 #endif
+	,VIASAT=16
 	};
 	struct Message
 	{
@@ -249,7 +251,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;