X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7734162c4314751a6a2539e09e06b8c7528359d9..269c1d980e92fa79d72c19b0a51db16240b2649d:/lib/service/servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index bae0c6e5..b4d0f196 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);
@@ -182,6 +183,7 @@ public:
 		// iStreamableService
 	RESULT stream(ePtr<iStreamableService> &ptr);
 	PyObject *getStreamingData();
+
 private:
 	friend class eServiceFactoryDVB;
 	eServiceReference m_reference;
@@ -208,7 +210,7 @@ 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;
@@ -218,6 +220,7 @@ private:
 
 	int m_current_audio_stream;
 	int selectAudioStream(int n = -1);
+	RESULT setFastForward_internal(int ratio);
 	
 		/* timeshift */
 	ePtr<iDVBTSRecorder> m_record;
@@ -272,7 +275,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 +285,6 @@ private:
 
 	ePtr<eConnection> m_video_event_connection;
 	void video_event(struct iTSMPEGDecoder::videoEvent);
-	struct iTSMPEGDecoder::videoEvent m_videoEventData;
 };
 
 class eStaticServiceDVBBouquetInformation: public iStaticServiceInformation
@@ -293,7 +295,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);
 };