X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fservicedvb.h;h=23675bf67e70a293fdaa9c688774f80c7be16da8;hp=6eba5064f57978334cda2061c26655e12440cfce;hb=8c55e2715c847f0dc5edd25af7ec3e4146592770;hpb=b23e0f70b3b0e6815b784f29cbe7d09982116c41

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 6eba506..23675bf 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -159,9 +159,10 @@ public:
 
 		// iTimeshiftService
 	RESULT startTimeshift();
-	RESULT stopTimeshift();
+	RESULT stopTimeshift(bool swToLive=true);
 	int isTimeshiftActive();
 	RESULT activateTimeshift();
+	RESULT setNextPlaybackFile(const char *fn);
 
 		// iCueSheet
 	PyObject *getCutList();
@@ -184,7 +185,7 @@ public:
 	RESULT stream(ePtr<iStreamableService> &ptr);
 	PyObject *getStreamingData();
 
-private:
+protected:
 	friend class eServiceFactoryDVB;
 	eServiceReference m_reference;
 	
@@ -210,17 +211,16 @@ private:
 	Signal2<void,iPlayableService*,int> m_event;
 	
 		/* pvr */
-	int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active;
+	int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active, m_timeshift_changed;
 	int m_first_program_info;
 	
-	std::string m_timeshift_file;
+	std::string m_timeshift_file, m_timeshift_file_next;
 	int m_timeshift_fd;
-	
 	ePtr<iDVBDemux> m_decode_demux;
 
 	int m_current_audio_stream;
 	int selectAudioStream(int n = -1);
-	RESULT setFastForward_internal(int ratio);
+	RESULT setFastForward_internal(int ratio, bool final_seek=false);
 	
 		/* timeshift */
 	ePtr<iDVBTSRecorder> m_record;
@@ -228,11 +228,15 @@ private:
 
 	void updateTimeshiftPids();
 	void switchToLive();
+
+	void resetTimeshift(int start);
 	void switchToTimeshift();
-	
-	void updateDecoder();
+
+	void updateDecoder(bool sendSeekableStateChanged=false);
 	
 	int m_skipmode;
+	int m_fastforward;
+	int m_slowmotion;
 	
 		/* cuesheet */
 	
@@ -285,6 +289,8 @@ private:
 
 	ePtr<eConnection> m_video_event_connection;
 	void video_event(struct iTSMPEGDecoder::videoEvent);
+
+	virtual ePtr<iDataSource> createDataSource(eServiceReferenceDVB &ref);
 };
 
 class eStaticServiceDVBBouquetInformation: public iStaticServiceInformation