X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/20f69c200ec5703e958a6b95abfcfd5a108e5939..8dfcf7d1701e9f178ec6d8d756a8bd779854a3d9:/lib/dvb/dvbtime.h

diff --git a/lib/dvb/dvbtime.h b/lib/dvb/dvbtime.h
index 59a26c21..8f75ab7f 100644
--- a/lib/dvb/dvbtime.h
+++ b/lib/dvb/dvbtime.h
@@ -3,7 +3,7 @@
 
 #include <lib/base/eerror.h>
 #include <lib/dvb/esection.h>
-#include <lib/dvb_si/tdt.h>
+#include <dvbsi++/time_date_section.h>
 
 class eDVBChannel;
 
@@ -25,30 +25,35 @@ class TDT: public eGTable
 	eTimer m_interval_timer;
 	int createTable(int nr, const __u8 *data, unsigned int max);
 	void ready(int);
+	int update_count;
 public:
-	TDT(eDVBChannel *chan);
+	TDT(eDVBChannel *chan, int update_count=0);
 	void start();
 	void startTimer(int interval);
+	int getUpdateCount() { return update_count; }
 };
 
 class eDVBLocalTimeHandler: public Object
 {
+	struct channel_data
+	{
+		TDT *tdt;
+		ePtr<eDVBChannel> channel;
+		ePtr<eConnection> m_stateChangedConn;
+	};
 	friend class TDT;
 	DECLARE_REF(eDVBLocalTimeHandler)
-	std::map<iDVBChannel*, TDT*> m_active_tables;
+	std::map<iDVBChannel*, channel_data> m_knownChannels;
 	std::map<eDVBChannelID,int> m_timeOffsetMap;
 	ePtr<eConnection> m_chanAddedConn;
-	ePtr<eConnection> m_chanRemovedConn;
-	ePtr<eConnection> m_chanRunningConn;
 	bool m_time_ready;
 	int m_time_difference;
 	int m_last_tp_time_difference;
 	void DVBChannelAdded(eDVBChannel*);
-	void DVBChannelRemoved(eDVBChannel*);
-	void DVBChannelRunning(iDVBChannel*);
+	void DVBChannelStateChanged(iDVBChannel*);
 	void readTimeOffsetData(const char*);
 	void writeTimeOffsetData(const char*);
-	void updateTime(time_t tp_time, eDVBChannel*);
+	void updateTime(time_t tp_time, eDVBChannel*, int updateCount);
 	static eDVBLocalTimeHandler *instance;
 public:
 	PSignal0<void> m_timeUpdated;