X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/912690ec8896bf6dfda931a6846516cc3b4ca979..428e33acd1d58d08045993554b81be20b53eb5c4:/lib/service/servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 0c5710d8..43e4690f 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -38,7 +38,7 @@ class eBouquet;
 
 class eDVBServiceList: public iListableService, public iMutableServiceList
 {
-DECLARE_REF(eDVBServiceList);
+	DECLARE_REF(eDVBServiceList);
 public:
 	virtual ~eDVBServiceList();
 	PyObject *getContent(const char* formatstr, bool sorted=false);
@@ -81,7 +81,7 @@ public:
 	PyObject *getAll(bool original); // a sum of getFrontendData/Status/TransponderData
 };
 
-class eSubtitleWidget; 
+class eSubtitleWidget;
 
 class eDVBServicePlay: public eDVBServiceBase,
 		public iPlayableService, public iPauseableService, 
@@ -91,7 +91,7 @@ class eDVBServicePlay: public eDVBServiceBase,
 		public iCueSheet, public iSubtitleOutput, public iAudioDelay,
 		public iRdsDecoder, public iStreamableService
 {
-DECLARE_REF(eDVBServicePlay);
+	DECLARE_REF(eDVBServicePlay);
 public:
 	virtual ~eDVBServicePlay();
 
@@ -218,6 +218,7 @@ private:
 
 	int m_current_audio_stream;
 	int selectAudioStream(int n = -1);
+	RESULT setFastForward_internal(int ratio);
 	
 		/* timeshift */
 	ePtr<iDVBTSRecorder> m_record;
@@ -272,7 +273,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 +283,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 +293,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);
 };