Merge branch 'bug_352_fix_some_cutlist_bugs'

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

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 037c1974d2e91970bd85b06db630c6c8964d4e09..7b3200066d2b9f4508adf932b34f1d2f382c2e9f 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/demux.h>
 #include <lib/dvb/frontend.h>
 #include <lib/dvb/tstools.h>

+#include <lib/dvb/esection.h>

 #include <connection.h>
 
 #include <connection.h>
 

+#include <dvbsi++/service_description_section.h>
+

 class eDVBChannel;
 
        /* we do NOT handle resource conflicts here. instead, the allocateChannel
 class eDVBChannel;
 
        /* we do NOT handle resource conflicts here. instead, the allocateChannel


@@ -22,18 +25,17 @@ class iDVBAdapter;
 class eDVBRegisteredFrontend: public iObject, public Object
 {
        DECLARE_REF(eDVBRegisteredFrontend);
 class eDVBRegisteredFrontend: public iObject, public Object
 {
        DECLARE_REF(eDVBRegisteredFrontend);

-       eTimer *disable;
-       Signal0<void> stateChanged;
+       ePtr<eTimer> disable;

        void closeFrontend()
        {
                if (!m_inuse && m_frontend->closeFrontend()) // frontend busy
                        disable->start(60000, true);  // retry close in 60secs
        }
 public:
        void closeFrontend()
        {
                if (!m_inuse && m_frontend->closeFrontend()) // frontend busy
                        disable->start(60000, true);  // retry close in 60secs
        }
 public:

+       Signal0<void> stateChanged;

        eDVBRegisteredFrontend(eDVBFrontend *fe, iDVBAdapter *adap)
        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)

        {
        {

-               disable = new eTimer(eApp);

                CONNECT(disable->timeout, eDVBRegisteredFrontend::closeFrontend);
        }
        void dec_use()
                CONNECT(disable->timeout, eDVBRegisteredFrontend::closeFrontend);
        }
        void dec_use()


@@ -59,7 +61,7 @@ public:
 
 struct eDVBRegisteredDemux
 {
 
 struct eDVBRegisteredDemux
 {

-DECLARE_REF(eDVBRegisteredDemux);
+       DECLARE_REF(eDVBRegisteredDemux);

 public:
        iDVBAdapter *m_adapter;
        ePtr<eDVBDemux> m_demux;
 public:
        iDVBAdapter *m_adapter;
        ePtr<eDVBDemux> m_demux;


@@ -69,7 +71,7 @@ public:
 
 class eDVBAllocatedFrontend
 {
 
 class eDVBAllocatedFrontend
 {

-DECLARE_REF(eDVBAllocatedFrontend);
+       DECLARE_REF(eDVBAllocatedFrontend);

 public:
        
        eDVBAllocatedFrontend(eDVBRegisteredFrontend *fe);
 public:
        
        eDVBAllocatedFrontend(eDVBRegisteredFrontend *fe);


@@ -84,7 +86,7 @@ private:
 
 class eDVBAllocatedDemux
 {
 
 class eDVBAllocatedDemux
 {

-DECLARE_REF(eDVBAllocatedDemux);
+       DECLARE_REF(eDVBAllocatedDemux);

 public:
        
        eDVBAllocatedDemux(eDVBRegisteredDemux *demux);
 public:
        
        eDVBAllocatedDemux(eDVBRegisteredDemux *demux);


@@ -104,12 +106,12 @@ public:
        virtual RESULT getDemux(ePtr<eDVBDemux> &demux, int nr) = 0;
        
        virtual int getNumFrontends() = 0;
        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
 {
 };
 
 class eDVBAdapterLinux: public iDVBAdapter
 {

-DECLARE_REF(eDVBAdapterLinux);
+       DECLARE_REF(eDVBAdapterLinux);

 public:
        eDVBAdapterLinux(int nr);
 
 public:
        eDVBAdapterLinux(int nr);
 


@@ -117,43 +119,31 @@ public:
        RESULT getDemux(ePtr<eDVBDemux> &demux, int nr);
        
        int getNumFrontends();
        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;
        
        static int exist(int nr);
 private:
        int m_nr;

-       eSmartPtrList<eDVBFrontend> m_frontend;
+       eSmartPtrList<eDVBFrontend> m_frontend, m_simulate_frontend;

        eSmartPtrList<eDVBDemux>    m_demux;
 };
        eSmartPtrList<eDVBDemux>    m_demux;
 };

-

 #endif // SWIG
 
 #endif // SWIG
 

+SWIG_IGNORE(eDVBResourceManager);

 class eDVBResourceManager: public iObject, public Object
 {
        DECLARE_REF(eDVBResourceManager);
        int avail, busy;
 
 class eDVBResourceManager: public iObject, public Object
 {
        DECLARE_REF(eDVBResourceManager);
        int avail, busy;
 

+       enum { DM7025, DM800, DM500HD, DM8000 };
+
+       int m_boxtype;
+

        eSmartPtrList<iDVBAdapter> m_adapter;
        eSmartPtrList<iDVBAdapter> m_adapter;

-       

        eSmartPtrList<eDVBRegisteredDemux> m_demux;
        eSmartPtrList<eDVBRegisteredDemux> m_demux;

-       eSmartPtrList<eDVBRegisteredFrontend> m_frontend;
-       
+       eSmartPtrList<eDVBRegisteredFrontend> m_frontend, m_simulate_frontend;

        void addAdapter(iDVBAdapter *adapter);
        void addAdapter(iDVBAdapter *adapter);

-       
-                       /* allocates a frontend able to tune to frontend paramters 'feperm'.
-                          the frontend must be tuned lateron. there is no guarante
-                          that tuning will succeed - it just means that if this frontend
-                          can't tune, no other frontend could do it.
-                          
-                          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 allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int index);
-       
-                       /* allocate a demux able to filter on the selected frontend. */
-       RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap);
-       
+

        struct active_channel
        {
                eDVBChannelID m_channel_id;
        struct active_channel
        {
                eDVBChannelID m_channel_id;


@@ -163,7 +153,7 @@ class eDVBResourceManager: public iObject, public Object
                active_channel(const eDVBChannelID &chid, eDVBChannel *ch) : m_channel_id(chid), m_channel(ch) { }
        };
        
                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;
        
        ePtr<iDVBChannelList> m_list;
        ePtr<iDVBSatelliteEquipmentControl> m_sec;


@@ -175,17 +165,15 @@ class eDVBResourceManager: public iObject, public Object
 
        Signal1<void,eDVBChannel*> m_channelAdded;
 
 
        Signal1<void,eDVBChannel*> m_channelAdded;
 

-       int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
-

        eUsePtr<iDVBChannel> m_cached_channel;
        Connection m_cached_channel_state_changed_conn;
        eUsePtr<iDVBChannel> m_cached_channel;
        Connection m_cached_channel_state_changed_conn;

-       eTimer m_releaseCachedChannelTimer;
+       ePtr<eTimer> m_releaseCachedChannelTimer;

        void DVBChannelStateChanged(iDVBChannel*);
        void DVBChannelStateChanged(iDVBChannel*);

-       void releaseCachedChannel();

        void feStateChanged();
 #ifndef SWIG
 public:
 #endif
        void feStateChanged();
 #ifndef SWIG
 public:
 #endif

+       void releaseCachedChannel();

        eDVBResourceManager();
        virtual ~eDVBResourceManager();
 
        eDVBResourceManager();
        virtual ~eDVBResourceManager();
 


@@ -193,27 +181,57 @@ public:
        RESULT getChannelList(ePtr<iDVBChannelList> &list);
        
        enum {
        RESULT getChannelList(ePtr<iDVBChannelList> &list);
        
        enum {

-               errNoFrontend = -1,
+                       /* errNoFrontend = -1 replaced by more spcific messages */

                errNoDemux    = -2,
                errNoDemux    = -2,

-               errChidNotFound = -3
+               errChidNotFound = -3,
+               errNoChannelList = -4,
+               errChannelNotInList = -5,
+               errAllSourcesBusy = -6,
+               errNoSourceFound = -7,

        };
        };

-
+       

        RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
        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... */
 
                /* 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);
        RESULT allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel);

+       static RESULT getInstance(ePtr<eDVBResourceManager> &);
+
+                       /* allocates a frontend able to tune to frontend paramters 'feperm'.
+                          the frontend must be tuned lateron. there is no guarante
+                          that tuning will succeed - it just means that if this frontend
+                          can't tune, no other frontend could do it.
+
+                          there might be a priority given to certain frontend/chid
+                          combinations. this will be evaluated here. */
+       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. */
+       RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int &cap);

 #ifdef SWIG
 public:
 #endif
 #ifdef SWIG
 public:
 #endif

+       int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm, bool simulate=false);
+       bool canMeasureFrontendInputPower();

        PSignal1<void,int> frontendUseMaskChanged;
        PSignal1<void,int> frontendUseMaskChanged;

-       RESULT allocateRawChannel(eUsePtr<iDVBChannel> &, int frontend_index);
-       static RESULT getInstance(ePtr<eDVBResourceManager> &);
+       SWIG_VOID(RESULT) allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int slot_index);
+       PyObject *setFrontendSlotInformations(SWIG_PYOBJECT(ePyObject) list);

 };
 };

-TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManagerPtr);
+SWIG_TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManager);
+SWIG_EXTEND(ePtr<eDVBResourceManager>,
+       static ePtr<eDVBResourceManager> getInstance()
+       {
+               extern ePtr<eDVBResourceManager> NewResourceManagerPtr(void);
+               return NewResourceManagerPtr();
+       }
+);
+

 #ifndef SWIG
 
 #ifndef SWIG
 

+class eDVBChannelFilePush;
+

        /* iDVBPVRChannel includes iDVBChannel. don't panic. */
 class eDVBChannel: public iDVBPVRChannel, public iFilePushScatterGather, public Object
 {
        /* iDVBPVRChannel includes iDVBChannel. don't panic. */
 class eDVBChannel: public iDVBPVRChannel, public iFilePushScatterGather, public Object
 {


@@ -248,6 +266,8 @@ public:
        RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode);
 
        int getUseCount() { return m_use_count; }
        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;
 private:
        ePtr<eDVBAllocatedFrontend> m_frontend;
        ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;


@@ -265,7 +285,7 @@ private:
        ePtr<eConnection> m_conn_frontendStateChanged;
        
                /* for PVR playback */
        ePtr<eConnection> m_conn_frontendStateChanged;
        
                /* for PVR playback */

-       eFilePushThread *m_pvr_thread;
+       eDVBChannelFilePush *m_pvr_thread;

        void pvrEvent(int event);
        
        int m_pvr_fd_dst;
        void pvrEvent(int event);
        
        int m_pvr_fd_dst;


@@ -275,7 +295,7 @@ private:
        
        void cueSheetEvent(int event);
        ePtr<eConnection> m_conn_cueSheetEvent;
        
        void cueSheetEvent(int event);
        ePtr<eConnection> m_conn_cueSheetEvent;

-       int m_skipmode_m, m_skipmode_n;
+       int m_skipmode_m, m_skipmode_n, m_skipmode_frames, m_skipmode_frames_remainder;

        
        std::list<std::pair<off_t, off_t> > m_source_span;
        void getNextSourceSpan(off_t current_offset, size_t bytes_read, off_t &start, size_t &size);
        
        std::list<std::pair<off_t, off_t> > m_source_span;
        void getNextSourceSpan(off_t current_offset, size_t bytes_read, off_t &start, size_t &size);


@@ -288,7 +308,13 @@ private:
        oRefCount m_use_count;
        void AddUse();
        void ReleaseUse();
        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
 #endif // SWIG

+

 #endif
 #endif