X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d2c297e62af0b7325ae058fdd5656044f0917bdd..477c468861635555c7179f2f4397dd765f499656:/lib/dvb/dvb.h

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index a7be0a71..15e27536 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -2,6 +2,8 @@
 #define __dvb_dvb_h
 
 #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>
@@ -115,13 +117,11 @@ private:
 	eSmartPtrList<eDVBDemux>    m_demux;
 };
 
-class eDVBResourceManager: public iObject
+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;
@@ -165,6 +165,11 @@ class eDVBResourceManager: public iObject
 	Signal1<void,eDVBChannel*> m_channelAdded;
 
 	bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
+
+	eUsePtr<iDVBChannel> m_cached_channel;
+	eTimer m_releaseCachedChannelTimer;
+	void DVBChannelStateChanged(iDVBChannel*);
+	void releaseCachedChannel();
 public:
 	eDVBResourceManager();
 	virtual ~eDVBResourceManager();
@@ -190,12 +195,11 @@ public:
 	bool canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
 };
 
-class eFilePushThread;
-
 	/* iDVBPVRChannel includes iDVBChannel. don't panic. */
-class eDVBChannel: public iDVBPVRChannel, public Object
+class eDVBChannel: public iDVBPVRChannel, public iFilePushScatterGather, public Object
 {
 	DECLARE_REF(eDVBChannel);
+	friend class eDVBResourceManager;
 public:
 	eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend);
 	virtual ~eDVBChannel();
@@ -206,6 +210,8 @@ public:
 	eDVBChannelID getChannelID() { return m_channel_id; }
 
 	RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection);
+	RESULT connectEvent(const Slot2<void,iDVBChannel*,int> &eventChange, ePtr<eConnection> &connection);
+	
 	RESULT getState(int &state);
 
 	RESULT setCIRouting(const eDVBCIRouting &routing);
@@ -214,21 +220,23 @@ public:
 	
 		/* iDVBPVRChannel */
 	RESULT playFile(const char *file);
+	void stopFile();
+	
+	void setCueSheet(eCueSheet *cuesheet);
+	
 	RESULT getLength(pts_t &len);
-	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(iDVBDemux *decoding_demux, const off_t &off);
+	RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode);
 
 	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;
 	
 	ePtr<iDVBFrontendParameters> m_current_frontend_parameters;
 	eDVBChannelID m_channel_id;
 	Signal1<void,iDVBChannel*> m_stateChanged;
+	Signal2<void,iDVBChannel*,int> m_event;
 	int m_state;
 
 			/* for channel list */
@@ -239,8 +247,22 @@ private:
 	
 		/* for PVR playback */
 	eFilePushThread *m_pvr_thread;
+	void pvrEvent(int event);
+	
 	int m_pvr_fd_src, m_pvr_fd_dst;
 	eDVBTSTools m_tstools;
+	
+	ePtr<eCueSheet> m_cue;
+	
+	void cueSheetEvent(int event);
+	ePtr<eConnection> m_conn_cueSheetEvent;
+	int m_skipmode_m, m_skipmode_n;
+	
+	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 */