X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fdvb.h;h=5fc2f043d26ce3f34af0a4f1d1a18443bc2c2dfc;hp=34c554926ddd184f49ae2de2fe14e707f14b4dcd;hb=d6c68fa2ec0f3c8b6248444a7414942291b571e1;hpb=a33ff213255db7f59090f70235ec06c502e2a2ce

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 34c5549..5fc2f04 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -1,27 +1,49 @@
 #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
 	   fails, and the application has to see why the channel is allocated
 	   (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;
@@ -105,18 +129,19 @@ 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(const eDVBChannelID &chid, 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);
+	RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap);
 	
 	struct active_channel
 	{
@@ -136,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();
@@ -154,27 +179,60 @@ public:
 		errNoDemux    = -2,
 		errChidNotFound = -3
 	};
-	
+
 		/* allocate channel... */
-	RESULT allocateChannel(const eDVBChannelID &channelid, ePtr<iDVBChannel> &channel);
-	RESULT allocateRawChannel(ePtr<iDVBChannel> &channel);
-	RESULT allocatePVRChannel(int caps);
+	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 eDVBChannel: public iDVBChannel, public Object
+class eFilePushThread;
+
+	/* iDVBPVRChannel includes iDVBChannel. don't panic. */
+class eDVBChannel: public iDVBPVRChannel, public Object
 {
 	DECLARE_REF(eDVBChannel);
+public:
+	eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend);
+	virtual ~eDVBChannel();
+
+		/* only for managed channels - effectively tunes to the channelid. should not be used... */
+		/* cannot be used for PVR channels. */
+	RESULT setChannel(const eDVBChannelID &id, ePtr<iDVBFrontendParameters> &feparam);
+	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);
+	RESULT getDemux(ePtr<iDVBDemux> &demux, int cap);
+	RESULT getFrontend(ePtr<iDVBFrontend> &frontend);
+	
+		/* iDVBPVRChannel */
+	RESULT playFile(const char *file);
+	RESULT getLength(pts_t &len);
+	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;
+	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 */
@@ -182,20 +240,19 @@ private:
 	
 	void frontendStateChanged(iDVBFrontend*fe);
 	ePtr<eConnection> m_conn_frontendStateChanged;
-public:
-	eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend, eDVBAllocatedDemux *demux);
-	virtual ~eDVBChannel();
-
-		/* only for managed channels - effectively tunes to the channelid. should not be used... */
-	RESULT setChannel(const eDVBChannelID &id);
-	eDVBChannelID getChannelID() { return m_channel_id; }
-
-	RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection);
-	RESULT getState(int &state);
+	
+		/* for PVR playback */
+	eFilePushThread *m_pvr_thread;
+	void pvrEvent(int event);
+	
+	int m_pvr_fd_src, m_pvr_fd_dst;
+	eDVBTSTools m_tstools;
 
-	RESULT setCIRouting(const eDVBCIRouting &routing);
-	RESULT getDemux(ePtr<iDVBDemux> &demux);
-	RESULT getFrontend(ePtr<iDVBFrontend> &frontend);
+	friend class eUsePtr<eDVBChannel>;
+		/* use count */
+	oRefCount m_use_count;
+	void AddUse();
+	void ReleaseUse();
 };
 
 #endif