X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f97a4e53dcd9321cfe4d026f8efac3a3fea1cb6a..0c59a4279f93f08fe95fca5f2e55f3e025f0cceb:/lib/dvb/dvb.h

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index d2148bc9..1a773efa 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -22,23 +22,19 @@ class iDVBAdapter;
 class eDVBRegisteredFrontend: public iObject, public Object
 {
 	DECLARE_REF(eDVBRegisteredFrontend);
-	eTimer *disable;
-	Signal0<void> stateChanged;
+	ePtr<eTimer> disable;
 	void closeFrontend()
 	{
 		if (!m_inuse && m_frontend->closeFrontend()) // frontend busy
 			disable->start(60000, true);  // retry close in 60secs
 	}
 public:
+	Signal0<void> stateChanged;
 	eDVBRegisteredFrontend(eDVBFrontend *fe, iDVBAdapter *adap)
-		:disable(new eTimer(eApp)), m_adapter(adap), m_frontend(fe), m_inuse(0)
+		:disable(eTimer::create(eApp)), m_adapter(adap), m_frontend(fe), m_inuse(0)
 	{
 		CONNECT(disable->timeout, eDVBRegisteredFrontend::closeFrontend);
 	}
-	~eDVBRegisteredFrontend()
-	{
-		delete disable;
-	}
 	void dec_use()
 	{
 		if (!--m_inuse)
@@ -62,7 +58,7 @@ public:
 
 struct eDVBRegisteredDemux
 {
-DECLARE_REF(eDVBRegisteredDemux);
+	DECLARE_REF(eDVBRegisteredDemux);
 public:
 	iDVBAdapter *m_adapter;
 	ePtr<eDVBDemux> m_demux;
@@ -72,7 +68,7 @@ public:
 
 class eDVBAllocatedFrontend
 {
-DECLARE_REF(eDVBAllocatedFrontend);
+	DECLARE_REF(eDVBAllocatedFrontend);
 public:
 	
 	eDVBAllocatedFrontend(eDVBRegisteredFrontend *fe);
@@ -87,7 +83,7 @@ private:
 
 class eDVBAllocatedDemux
 {
-DECLARE_REF(eDVBAllocatedDemux);
+	DECLARE_REF(eDVBAllocatedDemux);
 public:
 	
 	eDVBAllocatedDemux(eDVBRegisteredDemux *demux);
@@ -107,12 +103,12 @@ public:
 	virtual RESULT getDemux(ePtr<eDVBDemux> &demux, int nr) = 0;
 	
 	virtual int getNumFrontends() = 0;
-	virtual RESULT getFrontend(ePtr<eDVBFrontend> &fe, int nr) = 0;
+	virtual RESULT getFrontend(ePtr<eDVBFrontend> &fe, int nr, bool simulate=false) = 0;
 };
 
 class eDVBAdapterLinux: public iDVBAdapter
 {
-DECLARE_REF(eDVBAdapterLinux);
+	DECLARE_REF(eDVBAdapterLinux);
 public:
 	eDVBAdapterLinux(int nr);
 
@@ -120,12 +116,12 @@ public:
 	RESULT getDemux(ePtr<eDVBDemux> &demux, int nr);
 	
 	int getNumFrontends();
-	RESULT getFrontend(ePtr<eDVBFrontend> &fe, int nr);
+	RESULT getFrontend(ePtr<eDVBFrontend> &fe, int nr, bool simulate=false);
 	
 	static int exist(int nr);
 private:
 	int m_nr;
-	eSmartPtrList<eDVBFrontend> m_frontend;
+	eSmartPtrList<eDVBFrontend> m_frontend, m_simulate_frontend;
 	eSmartPtrList<eDVBDemux>    m_demux;
 };
 #endif // SWIG
@@ -137,26 +133,10 @@ class eDVBResourceManager: public iObject, public Object
 	int avail, busy;
 
 	eSmartPtrList<iDVBAdapter> m_adapter;
-	
 	eSmartPtrList<eDVBRegisteredDemux> m_demux;
-	eSmartPtrList<eDVBRegisteredFrontend> m_frontend;
-	
+	eSmartPtrList<eDVBRegisteredFrontend> m_frontend, m_simulate_frontend;
 	void addAdapter(iDVBAdapter *adapter);
-	
-			/* allocates a frontend able to tune to frontend paramters 'feperm'.
-			   the frontend must be tuned lateron. there is no guarante
-			   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(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm);
-	RESULT allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int slot_index);
-	
-			/* allocate a demux able to filter on the selected frontend. */
-	RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap);
-	
+
 	struct active_channel
 	{
 		eDVBChannelID m_channel_id;
@@ -166,7 +146,7 @@ class eDVBResourceManager: public iObject, public Object
 		active_channel(const eDVBChannelID &chid, eDVBChannel *ch) : m_channel_id(chid), m_channel(ch) { }
 	};
 	
-	std::list<active_channel> m_active_channels;
+	std::list<active_channel> m_active_channels, m_active_simulate_channels;
 	
 	ePtr<iDVBChannelList> m_list;
 	ePtr<iDVBSatelliteEquipmentControl> m_sec;
@@ -178,11 +158,9 @@ class eDVBResourceManager: public iObject, public Object
 
 	Signal1<void,eDVBChannel*> m_channelAdded;
 
-	int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
-
 	eUsePtr<iDVBChannel> m_cached_channel;
 	Connection m_cached_channel_state_changed_conn;
-	eTimer m_releaseCachedChannelTimer;
+	ePtr<eTimer> m_releaseCachedChannelTimer;
 	void DVBChannelStateChanged(iDVBChannel*);
 	void feStateChanged();
 #ifndef SWIG
@@ -209,12 +187,26 @@ public:
 	int canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
 
 		/* allocate channel... */
-	RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
+	RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel, bool simulate=false);
 	RESULT allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel);
 	static RESULT getInstance(ePtr<eDVBResourceManager> &);
+
+			/* allocates a frontend able to tune to frontend paramters 'feperm'.
+			   the frontend must be tuned lateron. there is no guarante
+			   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(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm, bool simulate=false);
+
+	RESULT allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int slot_index);
+			/* allocate a demux able to filter on the selected frontend. */
+	RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap);
 #ifdef SWIG
 public:
 #endif
+	int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
 	bool canMeasureFrontendInputPower();
 	PSignal1<void,int> frontendUseMaskChanged;
 	SWIG_VOID(RESULT) allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int slot_index);