make some methods public

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

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index fde9f741436fbea995547248daea6c221d19438b..04543ae22b74b689684e2aa7a9dd59296433a1fb 100644 (file)
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -23,19 +23,22 @@ class eDVBRegisteredFrontend: public iObject, public Object
 {
        DECLARE_REF(eDVBRegisteredFrontend);
        eTimer *disable;
-       Signal0<void> stateChanged;
        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)
                :disable(new eTimer(eApp)), m_adapter(adap), m_frontend(fe), m_inuse(0)
        {
-               disable = new eTimer(eApp);
                CONNECT(disable->timeout, eDVBRegisteredFrontend::closeFrontend);
        }
+       ~eDVBRegisteredFrontend()
+       {
+               delete disable;
+       }
        void dec_use()
        {
                if (!--m_inuse)
@@ -59,7 +62,7 @@ public:
 
 struct eDVBRegisteredDemux
 {
-DECLARE_REF(eDVBRegisteredDemux);
+       DECLARE_REF(eDVBRegisteredDemux);
 public:
        iDVBAdapter *m_adapter;
        ePtr<eDVBDemux> m_demux;
@@ -69,7 +72,7 @@ public:
 
 class eDVBAllocatedFrontend
 {
-DECLARE_REF(eDVBAllocatedFrontend);
+       DECLARE_REF(eDVBAllocatedFrontend);
 public:
        
        eDVBAllocatedFrontend(eDVBRegisteredFrontend *fe);
@@ -84,7 +87,7 @@ private:
 
 class eDVBAllocatedDemux
 {
-DECLARE_REF(eDVBAllocatedDemux);
+       DECLARE_REF(eDVBAllocatedDemux);
 public:
        
        eDVBAllocatedDemux(eDVBRegisteredDemux *demux);
@@ -109,7 +112,7 @@ public:
 
 class eDVBAdapterLinux: public iDVBAdapter
 {
-DECLARE_REF(eDVBAdapterLinux);
+       DECLARE_REF(eDVBAdapterLinux);
 public:
        eDVBAdapterLinux(int nr);
 
@@ -134,26 +137,10 @@ class eDVBResourceManager: public iObject, public Object
        int avail, busy;
 
        eSmartPtrList<iDVBAdapter> m_adapter;
-       
        eSmartPtrList<eDVBRegisteredDemux> m_demux;
        eSmartPtrList<eDVBRegisteredFrontend> m_frontend;
-       
        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;
@@ -175,17 +162,15 @@ class eDVBResourceManager: public iObject, public Object
 
        Signal1<void,eDVBChannel*> m_channelAdded;
 
-       int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
-
        eUsePtr<iDVBChannel> m_cached_channel;
        Connection m_cached_channel_state_changed_conn;
        eTimer m_releaseCachedChannelTimer;
        void DVBChannelStateChanged(iDVBChannel*);
-       void releaseCachedChannel();
        void feStateChanged();
 #ifndef SWIG
 public:
 #endif
+       void releaseCachedChannel();
        eDVBResourceManager();
        virtual ~eDVBResourceManager();
 
@@ -193,9 +178,13 @@ public:
        RESULT getChannelList(ePtr<iDVBChannelList> &list);
        
        enum {
-               errNoFrontend = -1,
+                       /* errNoFrontend = -1 replaced by more spcific messages */
                errNoDemux    = -2,
-               errChidNotFound = -3
+               errChidNotFound = -3,
+               errNoChannelList = -4,
+               errChannelNotInList = -5,
+               errAllSourcesBusy = -6,
+               errNoSourceFound = -7,
        };
        
        RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
@@ -205,13 +194,29 @@ public:
        RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &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);
+
+       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
+       int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
+       bool canMeasureFrontendInputPower();
        PSignal1<void,int> frontendUseMaskChanged;
-       SWIG_VOID(RESULT) allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int frontend_index);
+       SWIG_VOID(RESULT) allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int slot_index);
+       PyObject *setFrontendSlotInformations(SWIG_PYOBJECT(ePyObject) list);
 };
-SWIG_TEMPLATE_TYPEDEF_REPLACE(ePtr<eDVBResourceManager>, eDVBResourceManager);
+SWIG_TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManager);
 SWIG_EXTEND(ePtr<eDVBResourceManager>,
        static ePtr<eDVBResourceManager> getInstance()
        {
@@ -221,6 +226,9 @@ SWIG_EXTEND(ePtr<eDVBResourceManager>,
 );
 
 #ifndef SWIG
+
+class eDVBChannelFilePush;
+
        /* iDVBPVRChannel includes iDVBChannel. don't panic. */
 class eDVBChannel: public iDVBPVRChannel, public iFilePushScatterGather, public Object
 {
@@ -272,7 +280,7 @@ private:
        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;