add needed functions

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

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 03702db26794989196abcf3fe38d64a02b6630ee..a7be0a71f8de5e0b2f650156995743477469a556 100644 (file)
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -1,13 +1,13 @@
 #ifndef __dvb_dvb_h
 #define __dvb_dvb_h
 
+#include <lib/base/ebase.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/demux.h>
 #include <lib/dvb/frontend.h>
 #include <lib/dvb/tstools.h>
 #include <connection.h>
 
-class eDVBChannel;
 class eDVBChannel;
 
        /* we do NOT handle resource conflicts here. instead, the allocateChannel
@@ -15,14 +15,35 @@ class eDVBChannel;
           (and how to deallocate it). */
 class iDVBAdapter;
 
-class eDVBRegisteredFrontend: public iObject
+class eDVBRegisteredFrontend: public iObject, public Object
 {
-DECLARE_REF(eDVBRegisteredFrontend);
+       DECLARE_REF(eDVBRegisteredFrontend);
+       eTimer *disable;
+       void closeFrontend()
+       {
+               if (!m_inuse && m_frontend->closeFrontend()) // frontend busy
+                       disable->start(60000, true);  // retry close in 60secs
+       }
 public:
+       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);
+       }
+       void dec_use()
+       {
+               if (!--m_inuse)
+                       disable->start(3000, true);
+       }
+       void inc_use()
+       {
+               if (++m_inuse == 1)
+                       m_frontend->openFrontend();
+       }
        iDVBAdapter *m_adapter;
        ePtr<eDVBFrontend> m_frontend;
        int m_inuse;
-       eDVBRegisteredFrontend(eDVBFrontend *fe, iDVBAdapter *adap): m_adapter(adap), m_frontend(fe), m_inuse(0) { }
 };
 
 struct eDVBRegisteredDemux
@@ -98,7 +119,9 @@ class eDVBResourceManager: public iObject
 {
        DECLARE_REF(eDVBResourceManager);
        int avail, busy;
-       
+
+       eUsePtr<iDVBChannel> m_cached_channel;
+
        eSmartPtrList<iDVBAdapter> m_adapter;
        
        eSmartPtrList<eDVBRegisteredDemux> m_demux;
@@ -106,15 +129,16 @@ class eDVBResourceManager: public iObject
        
        void addAdapter(iDVBAdapter *adapter);
        
-                       /* allocates a frontend able to tune to channelID "chid".
+                       /* allocates a frontend able to tune to frontend paramters 'feperm'.
                           the frontend must be tuned lateron. there is no guarante
-                          that tuning will suceed - it just means that if this frontend
+                          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<iDVBFrontendParameters> &feparm, ePtr<eDVBAllocatedFrontend> &fe);
+       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);
@@ -137,10 +161,10 @@ class eDVBResourceManager: public iObject
        friend class eDVBChannel;
        RESULT addChannel(const eDVBChannelID &chid, eDVBChannel *ch);
        RESULT removeChannel(eDVBChannel *ch);
-       
+
        Signal1<void,eDVBChannel*> m_channelAdded;
-       Signal1<void,eDVBChannel*> m_channelRemoved;
-       Signal1<void,iDVBChannel*> m_channelRunning;
+
+       bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
 public:
        eDVBResourceManager();
        virtual ~eDVBResourceManager();
@@ -155,15 +179,15 @@ public:
                errNoDemux    = -2,
                errChidNotFound = -3
        };
-       
+
                /* allocate channel... */
        RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
-       RESULT allocateRawChannel(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);
-       RESULT connectChannelRemoved(const Slot1<void,eDVBChannel*> &channelRemoved, ePtr<eConnection> &connection);
-       RESULT connectChannelRunning(const Slot1<void,iDVBChannel*> &channelRemoved, ePtr<eConnection> &connection);
+
+       bool canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
 };
 
 class eFilePushThread;
@@ -191,12 +215,13 @@ public:
                /* iDVBPVRChannel */
        RESULT playFile(const char *file);
        RESULT getLength(pts_t &len);
-       RESULT getCurrentPosition(pts_t &pos);
-       RESULT seekTo(int relative, pts_t &pts);
+       RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos);
+       RESULT seekTo(iDVBDemux *decoding_demux, int relative, pts_t &pts);
                        /* seeking to relative positions won't work - 
                           there is an unknown amount of buffers in between */
-       RESULT seekToPosition(const off_t &off);
+       RESULT seekToPosition(iDVBDemux *decoding_demux, const off_t &off);
 
+       int getUseCount() { return m_use_count; }
 private:
        ePtr<eDVBAllocatedFrontend> m_frontend;
        ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;