X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8d0841a3c4d57ec102acc2a8ac09123b7ebdee27..80058dea34aae48ed729986a65112f0096f5b2d5:/lib/service/servicedvb.h?ds=sidebyside

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 29cff4d3..62d34169 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -6,12 +6,19 @@
 
 #include <lib/dvb/pmt.h>
 #include <lib/dvb/eit.h>
+#include <lib/dvb/subtitle.h>
 #include <lib/dvb/teletext.h>
+#include <lib/dvb/radiotext.h>
 #include <lib/base/filepush.h>
 
+class eStaticServiceDVBInformation;
+class eStaticServiceDVBBouquetInformation;
+
 class eServiceFactoryDVB: public iServiceHandler
 {
-DECLARE_REF(eServiceFactoryDVB);
+	DECLARE_REF(eServiceFactoryDVB);
+	ePtr<eStaticServiceDVBInformation> m_StaticServiceDVBInfo;
+	ePtr<eStaticServiceDVBBouquetInformation> m_StaticServiceDVBBouquetInfo;
 public:
 	eServiceFactoryDVB();
 	virtual ~eServiceFactoryDVB();
@@ -41,7 +48,7 @@ public:
 	
 	RESULT startEdit(ePtr<iMutableServiceList> &);
 	RESULT flushChanges();
-	RESULT addService(eServiceReference &ref);
+	RESULT addService(eServiceReference &ref, eServiceReference before);
 	RESULT removeService(eServiceReference &ref);
 	RESULT moveService(eServiceReference &ref, int pos);
 	RESULT setListName(const std::string &name);
@@ -59,7 +66,7 @@ private:
 class eDVBServiceBase: public iFrontendInformation
 {
 protected:
-	eDVBServicePMTHandler m_service_handler;
+	eDVBServicePMTHandler m_service_handler	;
 public:
 		// iFrontendInformation
 	int getFrontendInfo(int w);
@@ -73,7 +80,8 @@ class eDVBServicePlay: public eDVBServiceBase,
 		public iSeekableService, public Object, public iServiceInformation, 
 		public iAudioTrackSelection, public iAudioChannelSelection,
 		public iSubserviceList, public iTimeshiftService,
-		public iCueSheet, public iSubtitleOutput, public iAudioDelay
+		public iCueSheet, public iSubtitleOutput, public iAudioDelay,
+		public iRadioText
 {
 DECLARE_REF(eDVBServicePlay);
 public:
@@ -95,7 +103,8 @@ public:
 	RESULT timeshift(ePtr<iTimeshiftService> &ptr);
 	RESULT cueSheet(ePtr<iCueSheet> &ptr);
 	RESULT subtitle(ePtr<iSubtitleOutput> &ptr);
-	RESULT audioDelay(ePtr<iAudioDelay> &ptr);	
+	RESULT audioDelay(ePtr<iAudioDelay> &ptr);
+	RESULT radioText(ePtr<iRadioText> &ptr);
 
 		// iPauseableService
 	RESULT pause();
@@ -127,6 +136,9 @@ public:
 	int getCurrentChannel();
 	RESULT selectChannel(int i);
 
+		// iRadioText
+	std::string getRadioText(int i=0);
+
 		// iSubserviceList
 	int getNumberOfSubservices();
 	RESULT getSubservice(eServiceReference &subservice, unsigned int n);
@@ -161,6 +173,7 @@ private:
 	
 	ePtr<iTSMPEGDecoder> m_decoder;
 	int m_is_primary;
+	int m_have_video_pid;
 	
 		/* in timeshift mode, we essentially have two channels, and thus pmt handlers. */
 	eDVBServicePMTHandler m_service_handler_timeshift;
@@ -226,16 +239,27 @@ private:
 	
 	void cutlistToCuesheet();
 	
+	eSubtitleWidget *m_subtitle_widget;
+	
 		/* teletext subtitles */
+	ePtr<eDVBTeletextParser> m_teletext_parser;
 	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;
 	
+		/* dvb subtitles */
+	ePtr<eDVBSubtitleParser> m_subtitle_parser;
+	void newDVBSubtitlePage(const eDVBSubtitlePage &p);
+	ePtr<eConnection> m_new_dvb_subtitle_page_connection;
+	std::list<eDVBSubtitlePage> m_dvb_subtitle_pages;
+
+	eTimer m_subtitle_sync_timer;
 	void checkSubtitleTiming();
+
+		/* radiotext */
+	ePtr<eDVBRadioTextParser> m_radiotext_parser;
+	ePtr<eConnection> m_radiotext_updated_connection;
+	void radioTextUpdated();
 };
 
 #endif