X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/34e6431eb2c9fcfe1dd9ecf310970a257609c64a..ad5b517b4648c91ec34936ac5eba7cde4c34bb31:/lib/service/servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 0be174e2..d55cdd85 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -6,13 +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();
@@ -233,19 +239,26 @@ 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;
-	ePtr<eDVBRadioTextParser> m_radiotext_parser;
-	eSubtitleWidget *m_subtitle_widget;
 	eTimer m_subtitle_sync_timer;
 	std::list<eDVBTeletextSubtitlePage> m_subtitle_pages;
-	
 	void checkSubtitleTiming();
+	
+		/* dvb subtitles */
+	ePtr<eDVBSubtitleParser> m_subtitle_parser;
+	void newDVBSubtitleRegion(const eDVBSubtitleRegion &p);
+	ePtr<eConnection> m_new_dvb_subtitle_region_connection;
+	eTimer m_dvb_subtitle_sync_timer;
+	std::list<eDVBSubtitleRegion> m_dvb_subtitle_regions;
+	void checkDvbSubtitleTiming();
 
 		/* radiotext */
+	ePtr<eDVBRadioTextParser> m_radiotext_parser;
 	ePtr<eConnection> m_radiotext_updated_connection;
 	void radioTextUpdated();
 };