X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/85f2616ef78700cf2639992abaf1011ecaa897bd..37b38cb05fc6bc4993f852a78bdba93c7627cf5b:/lib/dvb/dvbtime.h

diff --git a/lib/dvb/dvbtime.h b/lib/dvb/dvbtime.h
index ec47de46..f403ffd4 100644
--- a/lib/dvb/dvbtime.h
+++ b/lib/dvb/dvbtime.h
@@ -18,14 +18,21 @@ inline int fromBCD(int bcd)
 	return ((bcd&0xF0)>>4)*10+(bcd&0xF);
 }
 
+inline int toBCD(int dec)
+{
+	if (dec >= 100)
+		return -1;
+	return int(dec/10)*0x10 + dec%10;
+}
+
 time_t parseDVBtime(__u8 t1, __u8 t2, __u8 t3, __u8 t4, __u8 t5);
 
 class TDT: public eGTable
 {
 	eDVBChannel *chan;
 	ePtr<iDVBDemux> demux;
-	eTimer m_interval_timer;
-	int createTable(int nr, const __u8 *data, unsigned int max);
+	ePtr<eTimer> m_interval_timer;
+	int createTable(unsigned int nr, const __u8 *data, unsigned int max);
 	void ready(int);
 	int update_count;
 public:
@@ -39,15 +46,15 @@ public:
 
 class eDVBLocalTimeHandler: public Object
 {
+	DECLARE_REF(eDVBLocalTimeHandler);
 	struct channel_data
 	{
-		TDT *tdt;
+		ePtr<TDT> tdt;
 		ePtr<eDVBChannel> channel;
 		ePtr<eConnection> m_stateChangedConn;
 		int m_prevChannelState;
 	};
 	friend class TDT;
-	DECLARE_REF(eDVBLocalTimeHandler)
 	std::map<iDVBChannel*, channel_data> m_knownChannels;
 	std::map<eDVBChannelID,int> m_timeOffsetMap;
 	ePtr<eConnection> m_chanAddedConn;
@@ -66,13 +73,11 @@ class eDVBLocalTimeHandler: public Object
 #endif
 public:
 #ifndef SWIG
-	PSignal0<void> m_timeUpdated;
 	eDVBLocalTimeHandler();
 	~eDVBLocalTimeHandler();
 #endif
-	time_t nowTime() const { return m_time_ready ? ::time(0)+m_time_difference : -1; }
+	PSignal0<void> m_timeUpdated;
 	bool ready() const { return m_time_ready; }
-	int difference() const { return m_time_difference; }
 	static eDVBLocalTimeHandler *getInstance() { return instance; }
 };