X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/20fdb2a2af40da98427a702a03a79b1fbec3d7af..462ec6f4ad2051551cb91c75ba614d3b7b17c543:/lib/dvb/dvb.h

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 5c3c5150..5fc2f043 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -1,6 +1,7 @@
 #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>
@@ -14,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
@@ -97,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;
@@ -137,12 +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, int used_tuner_mask);
+	bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
 public:
 	eDVBResourceManager();
 	virtual ~eDVBResourceManager();
@@ -164,10 +186,8 @@ public:
 	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);
+	bool canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
 };
 
 class eFilePushThread;
@@ -186,6 +206,8 @@ public:
 	eDVBChannelID getChannelID() { return m_channel_id; }
 
 	RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection);
+	RESULT connectEvent(const Slot2<void,iDVBChannel*,int> &eventChange, ePtr<eConnection> &connection);
+	
 	RESULT getState(int &state);
 
 	RESULT setCIRouting(const eDVBCIRouting &routing);
@@ -195,19 +217,22 @@ public:
 		/* iDVBPVRChannel */
 	RESULT playFile(const char *file);
 	RESULT getLength(pts_t &len);
-	RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos);
+	RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode);
 	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(iDVBDemux *decoding_demux, const off_t &off);
 
+	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;
 	
 	ePtr<iDVBFrontendParameters> m_current_frontend_parameters;
 	eDVBChannelID m_channel_id;
 	Signal1<void,iDVBChannel*> m_stateChanged;
+	Signal2<void,iDVBChannel*,int> m_event;
 	int m_state;
 
 			/* for channel list */
@@ -218,6 +243,8 @@ private:
 	
 		/* for PVR playback */
 	eFilePushThread *m_pvr_thread;
+	void pvrEvent(int event);
+	
 	int m_pvr_fd_src, m_pvr_fd_dst;
 	eDVBTSTools m_tstools;