X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5cdabb1038ec3f628001f26f5d587eb95ca6465d..654f9ddcbd850acbd23cb0b568632268cfd26f22:/lib/dvb/dvb.h

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index fcfbdfe7..a7be0a71 100644
--- 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;
@@ -138,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();
@@ -156,15 +179,15 @@ public:
 		errNoDemux    = -2,
 		errChidNotFound = -3
 	};
-	
+
 		/* 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);
-	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 +221,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;