"finished" message also when skipping configuration backup

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

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 04543ae22b74b689684e2aa7a9dd59296433a1fb..fa1801db9a5403e0bb763e5bb057fac5984398bd 100644 (file)
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -10,8 +10,11 @@
 #include <lib/dvb/demux.h>
 #include <lib/dvb/frontend.h>
 #include <lib/dvb/tstools.h>
+#include <lib/dvb/esection.h>
 #include <connection.h>
 
+#include <dvbsi++/service_description_section.h>
+
 class eDVBChannel;
 
        /* we do NOT handle resource conflicts here. instead, the allocateChannel
@@ -22,7 +25,7 @@ class iDVBAdapter;
 class eDVBRegisteredFrontend: public iObject, public Object
 {
        DECLARE_REF(eDVBRegisteredFrontend);
-       eTimer *disable;
+       ePtr<eTimer> disable;
        void closeFrontend()
        {
                if (!m_inuse && m_frontend->closeFrontend()) // frontend busy
@@ -31,14 +34,10 @@ class eDVBRegisteredFrontend: public iObject, public Object
 public:
        Signal0<void> stateChanged;
        eDVBRegisteredFrontend(eDVBFrontend *fe, iDVBAdapter *adap)
-               :disable(new eTimer(eApp)), m_adapter(adap), m_frontend(fe), m_inuse(0)
+               :disable(eTimer::create(eApp)), m_adapter(adap), m_frontend(fe), m_inuse(0)
        {
                CONNECT(disable->timeout, eDVBRegisteredFrontend::closeFrontend);
        }
-       ~eDVBRegisteredFrontend()
-       {
-               delete disable;
-       }
        void dec_use()
        {
                if (!--m_inuse)
@@ -107,7 +106,7 @@ public:
        virtual RESULT getDemux(ePtr<eDVBDemux> &demux, int nr) = 0;
        
        virtual int getNumFrontends() = 0;
-       virtual RESULT getFrontend(ePtr<eDVBFrontend> &fe, int nr) = 0;
+       virtual RESULT getFrontend(ePtr<eDVBFrontend> &fe, int nr, bool simulate=false) = 0;
 };
 
 class eDVBAdapterLinux: public iDVBAdapter
@@ -120,12 +119,12 @@ public:
        RESULT getDemux(ePtr<eDVBDemux> &demux, int nr);
        
        int getNumFrontends();
-       RESULT getFrontend(ePtr<eDVBFrontend> &fe, int nr);
+       RESULT getFrontend(ePtr<eDVBFrontend> &fe, int nr, bool simulate=false);
        
        static int exist(int nr);
 private:
        int m_nr;
-       eSmartPtrList<eDVBFrontend> m_frontend;
+       eSmartPtrList<eDVBFrontend> m_frontend, m_simulate_frontend;
        eSmartPtrList<eDVBDemux>    m_demux;
 };
 #endif // SWIG
@@ -138,7 +137,7 @@ class eDVBResourceManager: public iObject, public Object
 
        eSmartPtrList<iDVBAdapter> m_adapter;
        eSmartPtrList<eDVBRegisteredDemux> m_demux;
-       eSmartPtrList<eDVBRegisteredFrontend> m_frontend;
+       eSmartPtrList<eDVBRegisteredFrontend> m_frontend, m_simulate_frontend;
        void addAdapter(iDVBAdapter *adapter);
 
        struct active_channel
@@ -150,7 +149,7 @@ class eDVBResourceManager: public iObject, public Object
                active_channel(const eDVBChannelID &chid, eDVBChannel *ch) : m_channel_id(chid), m_channel(ch) { }
        };
        
-       std::list<active_channel> m_active_channels;
+       std::list<active_channel> m_active_channels, m_active_simulate_channels;
        
        ePtr<iDVBChannelList> m_list;
        ePtr<iDVBSatelliteEquipmentControl> m_sec;
@@ -164,7 +163,7 @@ class eDVBResourceManager: public iObject, public Object
 
        eUsePtr<iDVBChannel> m_cached_channel;
        Connection m_cached_channel_state_changed_conn;
-       eTimer m_releaseCachedChannelTimer;
+       ePtr<eTimer> m_releaseCachedChannelTimer;
        void DVBChannelStateChanged(iDVBChannel*);
        void feStateChanged();
 #ifndef SWIG
@@ -188,10 +187,10 @@ public:
        };
        
        RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
-       int canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
+       int canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore, bool simulate=false);
 
                /* allocate channel... */
-       RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
+       RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel, bool simulate=false);
        RESULT allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel);
        static RESULT getInstance(ePtr<eDVBResourceManager> &);
 
@@ -202,7 +201,7 @@ public:
 
                           there might be a priority given to certain frontend/chid
                           combinations. this will be evaluated here. */
-       RESULT allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm);
+       RESULT allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm, bool simulate=false);
 
        RESULT allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int slot_index);
                        /* allocate a demux able to filter on the selected frontend. */
@@ -210,7 +209,7 @@ public:
 #ifdef SWIG
 public:
 #endif
-       int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
+       int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm, bool simulate=false);
        bool canMeasureFrontendInputPower();
        PSignal1<void,int> frontendUseMaskChanged;
        SWIG_VOID(RESULT) allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int slot_index);
@@ -263,6 +262,8 @@ public:
        RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode);
 
        int getUseCount() { return m_use_count; }
+
+       RESULT requestTsidOnid(ePyObject callback);
 private:
        ePtr<eDVBAllocatedFrontend> m_frontend;
        ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;
@@ -303,6 +304,12 @@ private:
        oRefCount m_use_count;
        void AddUse();
        void ReleaseUse();
+
+               /* for tsid/onid read */
+       ePyObject m_tsid_onid_callback;
+       ePtr<iDVBDemux> m_tsid_onid_demux;
+       ePtr<eTable<ServiceDescriptionSection> > m_SDT;
+       void SDTready(int err);
 };
 #endif // SWIG