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

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 03702db2..fcfbdfe7 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -106,15 +106,16 @@ 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(ePtr<iDVBFrontendParameters> &feparm, 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, int cap);
@@ -158,7 +159,7 @@ public:
 	
 		/* allocate channel... */
 	RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
-	RESULT allocateRawChannel(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);
@@ -191,11 +192,11 @@ public:
 		/* iDVBPVRChannel */
 	RESULT playFile(const char *file);
 	RESULT getLength(pts_t &len);
-	RESULT getCurrentPosition(pts_t &pos);
-	RESULT seekTo(int relative, pts_t &pts);
+	RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos);
+	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(const off_t &off);
+	RESULT seekToPosition(iDVBDemux *decoding_demux, const off_t &off);
 
 private:
 	ePtr<eDVBAllocatedFrontend> m_frontend;