X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/33a78f65a250068a9c82707b704fb38f3a54091e..7273e47b06dacbd32e145e19728e09d9d86e7a6e:/lib/dvb/dvb.h

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index d9f049eb..d4c8eea0 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -4,6 +4,7 @@
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/demux.h>
 #include <lib/dvb/frontend.h>
+#include <lib/dvb/tstools.h>
 #include <connection.h>
 
 class eDVBChannel;
@@ -171,6 +172,27 @@ class eFilePushThread;
 class eDVBChannel: public iDVBPVRChannel, public Object
 {
 	DECLARE_REF(eDVBChannel);
+public:
+	eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend, eDVBAllocatedDemux *demux);
+	virtual ~eDVBChannel();
+
+		/* only for managed channels - effectively tunes to the channelid. should not be used... */
+		/* cannot be used for PVR channels. */
+	RESULT setChannel(const eDVBChannelID &id);
+	eDVBChannelID getChannelID() { return m_channel_id; }
+
+	RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection);
+	RESULT getState(int &state);
+
+	RESULT setCIRouting(const eDVBCIRouting &routing);
+	RESULT getDemux(ePtr<iDVBDemux> &demux);
+	RESULT getFrontend(ePtr<iDVBFrontend> &frontend);
+	
+		/* iDVBPVRChannel */
+	RESULT playFile(const char *file);
+	RESULT getLength(pts_t &len);
+	RESULT getCurrentPosition(pts_t &pos);
+
 private:
 	ePtr<eDVBAllocatedFrontend> m_frontend;
 	ePtr<eDVBAllocatedDemux> m_demux;
@@ -189,30 +211,13 @@ private:
 		/* for PVR playback */
 	eFilePushThread *m_pvr_thread;
 	int m_pvr_fd_src, m_pvr_fd_dst;
+	eDVBTSTools m_tstools;
 
 	friend class eUsePtr<eDVBChannel>;
 		/* use count */
 	oRefCount m_use_count;
 	void AddUse();
 	void ReleaseUse();
-public:
-	eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend, eDVBAllocatedDemux *demux);
-	virtual ~eDVBChannel();
-
-		/* only for managed channels - effectively tunes to the channelid. should not be used... */
-		/* cannot be used for PVR channels. */
-	RESULT setChannel(const eDVBChannelID &id);
-	eDVBChannelID getChannelID() { return m_channel_id; }
-
-	RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection);
-	RESULT getState(int &state);
-
-	RESULT setCIRouting(const eDVBCIRouting &routing);
-	RESULT getDemux(ePtr<iDVBDemux> &demux);
-	RESULT getFrontend(ePtr<iDVBFrontend> &frontend);
-	
-		/* iDVBPVRChannel */
-	RESULT playFile(const char *file);
 };
 
 #endif