always emit timeUpdated signal on first received TDT

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

diff --git a/lib/dvb/dvbtime.h b/lib/dvb/dvbtime.h
index 59a26c2148698cc4a1e3ac986121b354f743f49d..8f75ab7f51dcea4425fe2c5cca507a9b43f5418d 100644 (file)
--- 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/base/eerror.h>
 #include <lib/dvb/esection.h>

-#include <lib/dvb_si/tdt.h>
+#include <dvbsi++/time_date_section.h>

 
 class eDVBChannel;
 
 
 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);
        eTimer m_interval_timer;
        int createTable(int nr, const __u8 *data, unsigned int max);
        void ready(int);

+       int update_count;

 public:
 public:

-       TDT(eDVBChannel *chan);
+       TDT(eDVBChannel *chan, int update_count=0);

        void start();
        void startTimer(int interval);
        void start();
        void startTimer(int interval);

+       int getUpdateCount() { return update_count; }

 };
 
 class eDVBLocalTimeHandler: public Object
 {
 };
 
 class eDVBLocalTimeHandler: public Object
 {

+       struct channel_data
+       {
+               TDT *tdt;
+               ePtr<eDVBChannel> channel;
+               ePtr<eConnection> m_stateChangedConn;
+       };

        friend class TDT;
        DECLARE_REF(eDVBLocalTimeHandler)
        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;
        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*);
        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 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;
        static eDVBLocalTimeHandler *instance;
 public:
        PSignal0<void> m_timeUpdated;