Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / dvb / dvbtime.h

diff --git a/lib/dvb/dvbtime.h b/lib/dvb/dvbtime.h
index 2b07a250c967f761a6b65e2bbdd97b9a20221f90..f403ffd4d17985c7fd3f341e54f3d05e157b3ef9 100644 (file)
--- a/lib/dvb/dvbtime.h
+++ b/lib/dvb/dvbtime.h
@@ -31,7 +31,7 @@ class TDT: public eGTable
 {
        eDVBChannel *chan;
        ePtr<iDVBDemux> demux;
-       eTimer m_interval_timer;
+       ePtr<eTimer> m_interval_timer;
        int createTable(unsigned int nr, const __u8 *data, unsigned int max);
        void ready(int);
        int update_count;
@@ -46,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;
@@ -73,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; }
 };