X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a6014454bb8627882386ced03f75628304078637..a50379ad64b3f0b79af40876ebde0e6deb15d245:/lib/dvb/dvb.h

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 0c652e35..b23d047f 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -1,8 +1,11 @@
 #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>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/demux.h>
 #include <lib/dvb/frontend.h>
@@ -20,6 +23,7 @@ class eDVBRegisteredFrontend: public iObject, public Object
 {
 	DECLARE_REF(eDVBRegisteredFrontend);
 	eTimer *disable;
+	Signal0<void> stateChanged;
 	void closeFrontend()
 	{
 		if (!m_inuse && m_frontend->closeFrontend()) // frontend busy
@@ -35,12 +39,18 @@ public:
 	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;
@@ -115,14 +125,14 @@ private:
 	eSmartPtrList<eDVBFrontend> m_frontend;
 	eSmartPtrList<eDVBDemux>    m_demux;
 };
+#endif // SWIG
 
-class eDVBResourceManager: public iObject
+SWIG_IGNORE(eDVBResourceManager);
+class eDVBResourceManager: public iObject, public Object
 {
 	DECLARE_REF(eDVBResourceManager);
 	int avail, busy;
 
-	eUsePtr<iDVBChannel> m_cached_channel;
-
 	eSmartPtrList<iDVBAdapter> m_adapter;
 	
 	eSmartPtrList<eDVBRegisteredDemux> m_demux;
@@ -139,7 +149,7 @@ class eDVBResourceManager: public iObject
 			   combinations. this will be evaluated here. */
 			   
 	RESULT allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm);
-	RESULT allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int index);
+	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);
@@ -165,13 +175,20 @@ class eDVBResourceManager: public iObject
 
 	Signal1<void,eDVBChannel*> m_channelAdded;
 
-	bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
+	int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
+
+	eUsePtr<iDVBChannel> m_cached_channel;
+	Connection m_cached_channel_state_changed_conn;
+	eTimer m_releaseCachedChannelTimer;
+	void DVBChannelStateChanged(iDVBChannel*);
+	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);
 	
@@ -180,21 +197,39 @@ public:
 		errNoDemux    = -2,
 		errChidNotFound = -3
 	};
+	
+	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> &);
+#ifdef SWIG
+public:
+#endif
+	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();
+	}
+);
 
-	RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
+#ifndef SWIG
 
-	bool canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
-};
+class eDVBChannelFilePush;
 
 	/* iDVBPVRChannel includes iDVBChannel. don't panic. */
 class eDVBChannel: public iDVBPVRChannel, public iFilePushScatterGather, public Object
 {
 	DECLARE_REF(eDVBChannel);
+	friend class eDVBResourceManager;
 public:
 	eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend);
 	virtual ~eDVBChannel();
@@ -212,7 +247,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();
@@ -224,7 +260,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;
 	
@@ -241,10 +276,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;
@@ -256,6 +291,8 @@ private:
 	std::list<std::pair<off_t, off_t> > m_source_span;
 	void getNextSourceSpan(off_t current_offset, size_t bytes_read, off_t &start, size_t &size);
 	void flushPVR(iDVBDemux *decoding_demux=0);
+	
+	eSingleLock m_cuesheet_lock;
 
 	friend class eUsePtr<eDVBChannel>;
 		/* use count */
@@ -263,5 +300,6 @@ private:
 	void AddUse();
 	void ReleaseUse();
 };
+#endif // SWIG
 
 #endif