X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/740ae9b4a03c13901e4f4ffc008e4c0cfd63d896..56f5fa20371cd5a761dc37a6dd0dd730c38e0cbc:/lib/service/servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index b1df4cb7..a07e4410 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -6,6 +6,7 @@
 
 #include <lib/dvb/pmt.h>
 #include <lib/dvb/eit.h>
+#include <lib/base/filepush.h>
 
 class eServiceFactoryDVB: public iServiceHandler
 {
@@ -32,7 +33,8 @@ class eDVBServiceList: public iListableService, public iMutableServiceList
 DECLARE_REF(eDVBServiceList);
 public:
 	virtual ~eDVBServiceList();
-	RESULT getContent(std::list<eServiceReference> &list);
+	RESULT getContent(std::list<eServiceReference> &list, bool sorted=false);
+	RESULT getContent(PyObject *list, bool sorted=false);
 	RESULT getNext(eServiceReference &ptr);
 	int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
 	
@@ -41,6 +43,7 @@ public:
 	RESULT addService(eServiceReference &ref);
 	RESULT removeService(eServiceReference &ref);
 	RESULT moveService(eServiceReference &ref, int pos);
+	RESULT setListName(const std::string &name);
 private:
 	RESULT startQuery();
 	eServiceReference m_parent;
@@ -85,6 +88,7 @@ public:
 	RESULT seekRelative(int direction, pts_t to);
 	RESULT getPlayPosition(pts_t &pos);
 	RESULT setTrickmode(int trick=0);
+	RESULT isCurrentlySeekable();
 
 		// iServiceInformation
 	RESULT getName(std::string &name);
@@ -107,6 +111,8 @@ public:
 		// iTimeshiftService
 	RESULT startTimeshift();
 	RESULT stopTimeshift();
+	int isTimeshiftActive();
+	RESULT activateTimeshift();
 
 private:
 	friend class eServiceFactoryDVB;
@@ -116,7 +122,8 @@ private:
 	
 	ePtr<iTSMPEGDecoder> m_decoder;
 	
-	eDVBServicePMTHandler m_service_handler;
+		/* in timeshift mode, we essentially have two channels, and thus pmt handlers. */
+	eDVBServicePMTHandler m_service_handler, m_service_handler_timeshift;
 	eDVBServiceEITHandler m_event_handler;
 	
 	eDVBServicePlay(const eServiceReference &ref, eDVBService *service);
@@ -124,12 +131,31 @@ private:
 	void gotNewEvent();
 	
 	void serviceEvent(int event);
+	void serviceEventTimeshift(int event);
 	Signal2<void,iPlayableService*,int> m_event;
 	
-	int m_is_pvr, m_is_paused, m_timeshift_enabled;
+	int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active;
+	
+	std::string m_timeshift_file;
+	int m_timeshift_fd;
+	
+	ePtr<iDVBDemux> m_decode_demux;
 	
 	int m_current_audio_stream;
 	int selectAudioStream(int n);
+	
+	ePtr<iDVBTSRecorder> m_record;
+	std::set<int> m_pids_active;
+
+	void updateTimeshiftPids();
+	void switchToLive();
+	void switchToTimeshift();
+	
+	void updateDecoder();
+	
+	int m_skipmode;
+	
+	ePtr<eCueSheet> m_cue;
 };
 
 #endif