X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6629073331fbe67edfa9f4d591c9df6e41c465a6..29ec53f34486f08c1655b64ba95a949c1e1094af:/lib/dvb/dvb.h

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 692ae839..b23d047f 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -149,7 +149,7 @@ class eDVBResourceManager: public iObject, public Object
 			   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);
@@ -181,11 +181,11 @@ class eDVBResourceManager: public iObject, public Object
 	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();
 
@@ -209,7 +209,8 @@ public:
 public:
 #endif
 	PSignal1<void,int> frontendUseMaskChanged;
-	SWIG_VOID(RESULT) allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int frontend_index);
+	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>,
@@ -221,6 +222,9 @@ SWIG_EXTEND(ePtr<eDVBResourceManager>,
 );
 
 #ifndef SWIG
+
+class eDVBChannelFilePush;
+
 	/* iDVBPVRChannel includes iDVBChannel. don't panic. */
 class eDVBChannel: public iDVBPVRChannel, public iFilePushScatterGather, public Object
 {
@@ -272,7 +276,7 @@ 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_dst;