add ability to select in scan what is todo with existing services (Clear before scan)

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

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 0e449144462132ee558f41cdc41d78a96e4a39f9..bc51ccd89b61d9753171a6c14a6ab98539ca2e59 100644 (file)
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -1,6 +1,8 @@
 #ifndef __dvb_dvb_h
 #define __dvb_dvb_h
 
+#ifndef SWIG
+
 #include <lib/base/ebase.h>
 #include <lib/base/filepush.h>
 #include <lib/base/elock.h>
@@ -117,13 +119,13 @@ private:
        eSmartPtrList<eDVBDemux>    m_demux;
 };
 
-class eDVBResourceManager: public iObject
+#endif // SWIG
+
+class eDVBResourceManager: public iObject, public Object
 {
        DECLARE_REF(eDVBResourceManager);
        int avail, busy;
 
-       eUsePtr<iDVBChannel> m_cached_channel;
-
        eSmartPtrList<iDVBAdapter> m_adapter;
        
        eSmartPtrList<eDVBRegisteredDemux> m_demux;
@@ -167,12 +169,18 @@ class eDVBResourceManager: public iObject
        Signal1<void,eDVBChannel*> m_channelAdded;
 
        bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
+
+       eUsePtr<iDVBChannel> m_cached_channel;
+       Connection m_cached_channel_state_changed_conn;
+       eTimer m_releaseCachedChannelTimer;
+       void DVBChannelStateChanged(iDVBChannel*);
+       void releaseCachedChannel();
+#ifndef SWIG
 public:
+#endif
        eDVBResourceManager();
        virtual ~eDVBResourceManager();
-       
-       static RESULT getInstance(ePtr<eDVBResourceManager> &ptr) { if (instance) { ptr = instance; return 0; } return -1; }
-       
+
        RESULT setChannelList(iDVBChannelList *list);
        RESULT getChannelList(ePtr<iDVBChannelList> &list);
        
@@ -182,20 +190,26 @@ public:
                errChidNotFound = -3
        };
 
+       RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
+       bool canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
+
                /* allocate channel... */
        RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
-       RESULT allocateRawChannel(eUsePtr<iDVBChannel> &channel, int frontend_index);
        RESULT allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel);
-
-       RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
-
-       bool canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
+#ifdef SWIG
+public:
+#endif
+       RESULT allocateRawChannel(eUsePtr<iDVBChannel> &, int frontend_index);
+       static RESULT getInstance(ePtr<eDVBResourceManager> &);
 };
+TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManagerPtr);
+#ifndef SWIG
 
        /* iDVBPVRChannel includes iDVBChannel. don't panic. */
 class eDVBChannel: public iDVBPVRChannel, public iFilePushScatterGather, public Object
 {
        DECLARE_REF(eDVBChannel);
+       friend class eDVBResourceManager;
 public:
        eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend);
        virtual ~eDVBChannel();
@@ -213,7 +227,8 @@ public:
        RESULT setCIRouting(const eDVBCIRouting &routing);
        RESULT getDemux(ePtr<iDVBDemux> &demux, int cap);
        RESULT getFrontend(ePtr<iDVBFrontend> &frontend);
-       
+       RESULT getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &param);
+
                /* iDVBPVRChannel */
        RESULT playFile(const char *file);
        void stopFile();
@@ -225,7 +240,6 @@ public:
 
        int getUseCount() { return m_use_count; }
 private:
-       ePtr<iDVBFrontendParameters> m_feparm; // for retune on lostlock
        ePtr<eDVBAllocatedFrontend> m_frontend;
        ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;
        
@@ -245,7 +259,7 @@ private:
        eFilePushThread *m_pvr_thread;
        void pvrEvent(int event);
        
-       int m_pvr_fd_src, m_pvr_fd_dst;
+       int m_pvr_fd_dst;
        eDVBTSTools m_tstools;
        
        ePtr<eCueSheet> m_cue;
@@ -267,4 +281,5 @@ private:
        void ReleaseUse();
 };
 
+#endif // SWIG
 #endif