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

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

diff --git a/lib/dvb/dvbtime.h b/lib/dvb/dvbtime.h
index debbbff9cdc3a5bf2ce33937c5329da9e8f1047e..3afff75e0d522abe799224ff70277a89e760bab1 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,17 @@ 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;
        };
+       bool m_use_dvb_time;
+       ePtr<eTimer> m_updateNonTunedTimer;
        friend class TDT;
-       DECLARE_REF(eDVBLocalTimeHandler)
        std::map<iDVBChannel*, channel_data> m_knownChannels;
        std::map<eDVBChannelID,int> m_timeOffsetMap;
        ePtr<eConnection> m_chanAddedConn;
@@ -66,6 +68,7 @@ class eDVBLocalTimeHandler: public Object
        void readTimeOffsetData(const char*);
        void writeTimeOffsetData(const char*);
        void updateTime(time_t tp_time, eDVBChannel*, int updateCount);
+       void updateNonTuned();
        static eDVBLocalTimeHandler *instance;
 #ifdef SWIG
        eDVBLocalTimeHandler();
@@ -76,6 +79,8 @@ public:
        eDVBLocalTimeHandler();
        ~eDVBLocalTimeHandler();
 #endif
+       bool getUseDVBTime() { return m_use_dvb_time; }
+       void setUseDVBTime(bool b);
        PSignal0<void> m_timeUpdated;
        bool ready() const { return m_time_ready; }
        static eDVBLocalTimeHandler *getInstance() { return instance; }