X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6a4d3199f96849af7ef9fae324f34ec4d1b7412b..bef9bfb55955648b877b743c793b9d79a5a7bfe5:/lib/dvb/dvb.h

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 15e27536..04543ae2 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -1,6 +1,8 @@
 #ifndef __dvb_dvb_h
 #define __dvb_dvb_h
 
+#ifndef SWIG
+
 #include <lib/base/ebase.h>
 #include <lib/base/filepush.h>
 #include <lib/base/elock.h>
@@ -27,21 +29,31 @@ class eDVBRegisteredFrontend: public iObject, public Object
 			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 = new eTimer(eApp);
 		CONNECT(disable->timeout, eDVBRegisteredFrontend::closeFrontend);
 	}
+	~eDVBRegisteredFrontend()
+	{
+		delete disable;
+	}
 	void dec_use()
 	{
 		if (!--m_inuse)
+		{
+			/* emit */ stateChanged();
 			disable->start(3000, true);
+		}
 	}
 	void inc_use()
 	{
 		if (++m_inuse == 1)
+		{
 			m_frontend->openFrontend();
+			/* emit */ stateChanged();
+		}
 	}
 	iDVBAdapter *m_adapter;
 	ePtr<eDVBFrontend> m_frontend;
@@ -50,7 +62,7 @@ public:
 
 struct eDVBRegisteredDemux
 {
-DECLARE_REF(eDVBRegisteredDemux);
+	DECLARE_REF(eDVBRegisteredDemux);
 public:
 	iDVBAdapter *m_adapter;
 	ePtr<eDVBDemux> m_demux;
@@ -60,7 +72,7 @@ public:
 
 class eDVBAllocatedFrontend
 {
-DECLARE_REF(eDVBAllocatedFrontend);
+	DECLARE_REF(eDVBAllocatedFrontend);
 public:
 	
 	eDVBAllocatedFrontend(eDVBRegisteredFrontend *fe);
@@ -75,7 +87,7 @@ private:
 
 class eDVBAllocatedDemux
 {
-DECLARE_REF(eDVBAllocatedDemux);
+	DECLARE_REF(eDVBAllocatedDemux);
 public:
 	
 	eDVBAllocatedDemux(eDVBRegisteredDemux *demux);
@@ -100,7 +112,7 @@ public:
 
 class eDVBAdapterLinux: public iDVBAdapter
 {
-DECLARE_REF(eDVBAdapterLinux);
+	DECLARE_REF(eDVBAdapterLinux);
 public:
 	eDVBAdapterLinux(int nr);
 
@@ -116,33 +128,19 @@ private:
 	eSmartPtrList<eDVBFrontend> m_frontend;
 	eSmartPtrList<eDVBDemux>    m_demux;
 };
+#endif // SWIG
 
+SWIG_IGNORE(eDVBResourceManager);
 class eDVBResourceManager: public iObject, public Object
 {
 	DECLARE_REF(eDVBResourceManager);
 	int avail, busy;
 
 	eSmartPtrList<iDVBAdapter> m_adapter;
-	
 	eSmartPtrList<eDVBRegisteredDemux> m_demux;
 	eSmartPtrList<eDVBRegisteredFrontend> m_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 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;
@@ -164,36 +162,72 @@ class eDVBResourceManager: public iObject, public Object
 
 	Signal1<void,eDVBChannel*> m_channelAdded;
 
-	bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
-
 	eUsePtr<iDVBChannel> m_cached_channel;
+	Connection m_cached_channel_state_changed_conn;
 	eTimer m_releaseCachedChannelTimer;
 	void DVBChannelStateChanged(iDVBChannel*);
-	void releaseCachedChannel();
+	void feStateChanged();
+#ifndef SWIG
 public:
+#endif
+	void releaseCachedChannel();
 	eDVBResourceManager();
 	virtual ~eDVBResourceManager();
-	
-	static RESULT getInstance(ePtr<eDVBResourceManager> &ptr) { if (instance) { ptr = instance; return 0; } return -1; }
-	
+
 	RESULT setChannelList(iDVBChannelList *list);
 	RESULT getChannelList(ePtr<iDVBChannelList> &list);
 	
 	enum {
-		errNoFrontend = -1,
+			/* errNoFrontend = -1 replaced by more spcific messages */
 		errNoDemux    = -2,
-		errChidNotFound = -3
+		errChidNotFound = -3,
+		errNoChannelList = -4,
+		errChannelNotInList = -5,
+		errAllSourcesBusy = -6,
+		errNoSourceFound = -7,
 	};
+	
+	RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
+	int canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
 
 		/* allocate channel... */
 	RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
-	RESULT allocateRawChannel(eUsePtr<iDVBChannel> &channel, int frontend_index);
 	RESULT allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel);
+	static RESULT getInstance(ePtr<eDVBResourceManager> &);
 
-	RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
+			/* 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 canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
+	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);
+	PyObject *setFrontendSlotInformations(SWIG_PYOBJECT(ePyObject) list);
 };
+SWIG_TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManager);
+SWIG_EXTEND(ePtr<eDVBResourceManager>,
+	static ePtr<eDVBResourceManager> getInstance()
+	{
+		extern ePtr<eDVBResourceManager> NewResourceManagerPtr(void);
+		return NewResourceManagerPtr();
+	}
+);
+
+#ifndef SWIG
+
+class eDVBChannelFilePush;
 
 	/* iDVBPVRChannel includes iDVBChannel. don't panic. */
 class eDVBChannel: public iDVBPVRChannel, public iFilePushScatterGather, public Object
@@ -217,7 +251,8 @@ public:
 	RESULT setCIRouting(const eDVBCIRouting &routing);
 	RESULT getDemux(ePtr<iDVBDemux> &demux, int cap);
 	RESULT getFrontend(ePtr<iDVBFrontend> &frontend);
-	
+	RESULT getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &param);
+
 		/* iDVBPVRChannel */
 	RESULT playFile(const char *file);
 	void stopFile();
@@ -229,7 +264,6 @@ public:
 
 	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;
 	
@@ -246,10 +280,10 @@ private:
 	ePtr<eConnection> m_conn_frontendStateChanged;
 	
 		/* for PVR playback */
-	eFilePushThread *m_pvr_thread;
+	eDVBChannelFilePush *m_pvr_thread;
 	void pvrEvent(int event);
 	
-	int m_pvr_fd_src, m_pvr_fd_dst;
+	int m_pvr_fd_dst;
 	eDVBTSTools m_tstools;
 	
 	ePtr<eCueSheet> m_cue;
@@ -270,5 +304,6 @@ private:
 	void AddUse();
 	void ReleaseUse();
 };
+#endif // SWIG
 
 #endif