X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fservice%2Fservicedvb.h;h=6ced102741556f9edf259a4ca679ad8233b99305;hb=9d9d69d8242d27915c95cb794bd4e7a93759b6db;hp=bae0c6e5d18cf05da6b5ae3a8a95c6e54d8a6d30;hpb=7734162c4314751a6a2539e09e06b8c7528359d9;p=vuplus_dvbapp

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index bae0c6e..6ced102 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -114,13 +114,14 @@ public:
 	RESULT audioDelay(ePtr<iAudioDelay> &ptr);
 	RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr);
 	RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }
+	RESULT streamed(ePtr<iStreamedService> &ptr) { ptr = 0; return -1; }
 
 		// iPauseableService
 	RESULT pause();
 	RESULT unpause();
 	RESULT setSlowMotion(int ratio);
 	RESULT setFastForward(int ratio);
-    	
+
 		// iSeekableService
 	RESULT getLength(pts_t &len);
 	RESULT seekTo(pts_t to);
@@ -158,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();
@@ -182,7 +184,8 @@ public:
 		// iStreamableService
 	RESULT stream(ePtr<iStreamableService> &ptr);
 	PyObject *getStreamingData();
-private:
+
+protected:
 	friend class eServiceFactoryDVB;
 	eServiceReference m_reference;
 	
@@ -206,18 +209,20 @@ private:
 	void serviceEvent(int event);
 	void serviceEventTimeshift(int event);
 	Signal2<void,iPlayableService*,int> m_event;
+
+	int m_is_stream;
 	
 		/* 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, bool final_seek=false);
 	
 		/* timeshift */
 	ePtr<iDVBTSRecorder> m_record;
@@ -225,11 +230,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 */
 	
@@ -272,7 +281,7 @@ private:
 	ePtr<eConnection> m_new_dvb_subtitle_page_connection;
 	std::list<eDVBSubtitlePage> m_dvb_subtitle_pages;
 
-	eTimer m_subtitle_sync_timer;
+	ePtr<eTimer> m_subtitle_sync_timer;
 	void checkSubtitleTiming();
 
 		/* radiotext */
@@ -282,7 +291,8 @@ private:
 
 	ePtr<eConnection> m_video_event_connection;
 	void video_event(struct iTSMPEGDecoder::videoEvent);
-	struct iTSMPEGDecoder::videoEvent m_videoEventData;
+
+	virtual ePtr<iTsSource> createTsSource(eServiceReferenceDVB &ref);
 };
 
 class eStaticServiceDVBBouquetInformation: public iStaticServiceInformation
@@ -293,7 +303,7 @@ public:
 	eServiceReference &getPlayableService() { return m_playable_service; }
 	RESULT getName(const eServiceReference &ref, std::string &name);
 	int getLength(const eServiceReference &ref);
-	int isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+	int isPlayable(const eServiceReference &ref, const eServiceReference &ignore, bool simulate=false);
 	RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time);
 };