X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2c1f4947646d051133197a23a73ee985b56e1713..ed31f016b6ab55e864bb31bcc0f4c922dfeb7040:/lib/dvb/dvb.h

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 355e2469..ee8ea8ef 100644
--- 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;