small fix

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

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 355e246998b7c660e25024810b15188f54370497..ee8ea8ef5afe3df05c53a7db0e63f4bee0a6e13e 100644 (file)
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -7,7 +7,6 @@
 #include <lib/dvb/tstools.h>
 #include <connection.h>
 
-class eDVBChannel;
 class eDVBChannel;
 
        /* we do NOT handle resource conflicts here. instead, the allocateChannel
@@ -138,10 +137,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();
@@ -158,13 +157,13 @@ public:
        };
 
                /* allocate channel... */
-       RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel, bool fake=false);
+       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);
-       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;
@@ -198,6 +197,7 @@ public:
                           there is an unknown amount of buffers in between */
        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;