X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a2aaaa1836cc7d4348429418c36d6742a6b3bc5a..6e95f24aaf7e2629f193269397ec187ddda8ea3d:/lib/service/servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 01eb0497..5b9cf75c 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -56,11 +56,24 @@ private:
 	eBouquet *m_bouquet;
 };
 
-class eDVBServicePlay: public iPlayableService, public iPauseableService, 
+class eDVBServiceBase: public iFrontendInformation
+{
+protected:
+	eDVBServicePMTHandler m_service_handler;
+public:
+		// iFrontendInformation
+	int getFrontendInfo(int w);
+	PyObject *getFrontendData(bool);
+};
+
+class eSubtitleWidget; 
+
+class eDVBServicePlay: public eDVBServiceBase,
+		public iPlayableService, public iPauseableService, 
 		public iSeekableService, public Object, public iServiceInformation, 
-		public iAudioTrackSelection, public iFrontendStatusInformation,
+		public iAudioTrackSelection, public iAudioChannelSelection,
 		public iSubserviceList, public iTimeshiftService,
-		public iCueSheet
+		public iCueSheet, public iSubtitleOutput
 {
 DECLARE_REF(eDVBServicePlay);
 public:
@@ -75,11 +88,13 @@ public:
 	RESULT seek(ePtr<iSeekableService> &ptr);
 	RESULT pause(ePtr<iPauseableService> &ptr);
 	RESULT info(ePtr<iServiceInformation> &ptr);
+	RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr);
 	RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr);
-	RESULT frontendStatusInfo(ePtr<iFrontendStatusInformation> &ptr);
+	RESULT frontendInfo(ePtr<iFrontendInformation> &ptr);
 	RESULT subServices(ePtr<iSubserviceList> &ptr);
 	RESULT timeshift(ePtr<iTimeshiftService> &ptr);
 	RESULT cueSheet(ePtr<iCueSheet> &ptr);
+	RESULT subtitle(ePtr<iSubtitleOutput> &ptr);
 
 		// iPauseableService
 	RESULT pause();
@@ -107,9 +122,9 @@ public:
 	RESULT selectTrack(unsigned int i);
 	RESULT getTrackInfo(struct iAudioTrackInfo &, unsigned int n);
 
-		// iFrontendStatusInformation
-	int getFrontendInfo(int w);
-	PyObject *getFrontendData(bool);
+		// iAudioChannelSelection	
+	int getCurrentChannel();
+	RESULT selectChannel(int i);
 
 		// iSubserviceList
 	int getNumberOfSubservices();
@@ -126,6 +141,11 @@ public:
 	void setCutList(PyObject *);
 	void setCutListEnable(int enable);
 	
+		// iSubtitleOutput
+	RESULT enableSubtitles(eWidget *parent, PyObject *entry);
+	RESULT disableSubtitles(eWidget *parent);
+	PyObject *getSubtitleList();
+
 private:
 	friend class eServiceFactoryDVB;
 	eServiceReference m_reference;
@@ -136,7 +156,7 @@ private:
 	int m_is_primary;
 	
 		/* in timeshift mode, we essentially have two channels, and thus pmt handlers. */
-	eDVBServicePMTHandler m_service_handler, m_service_handler_timeshift;
+	eDVBServicePMTHandler m_service_handler_timeshift;
 	eDVBServiceEITHandler m_event_handler;
 	
 	eDVBServicePlay(const eServiceReference &ref, eDVBService *service);
@@ -200,7 +220,15 @@ private:
 	void cutlistToCuesheet();
 	
 		/* teletext subtitles */
+	void newSubtitlePage(const eDVBTeletextSubtitlePage &p);
+	ePtr<eConnection> m_new_subtitle_page_connection;
+	
 	ePtr<eDVBTeletextParser> m_teletext_parser;
+	eSubtitleWidget *m_subtitle_widget;
+	eTimer m_subtitle_sync_timer;
+	std::list<eDVBTeletextSubtitlePage> m_subtitle_pages;
+	
+	void checkSubtitleTiming();
 };
 
 #endif