X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fservicedvb.h;h=27f48b5735c8b2c51d0078801c6f8c91fc728926;hp=8026d6558bb1a9f84188afd7ccb4308daa2eb834;hb=265fb595e8767536096985bcfca7d0c36e61b5a0;hpb=9e0783f71e37ee01c3e4861392234221cec323ce

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 8026d65..27f48b5 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();
@@ -37,11 +44,11 @@ public:
 	PyObject *getContent(const char* formatstr, bool sorted=false);
 	RESULT getContent(std::list<eServiceReference> &list, bool sorted=false);
 	RESULT getNext(eServiceReference &ptr);
-	int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
+	inline int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
 	
 	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);
@@ -56,10 +63,15 @@ private:
 	eBouquet *m_bouquet;
 };
 
+inline int eDVBServiceList::compareLessEqual(const eServiceReference &a, const eServiceReference &b)
+{
+	return m_query->compareLessEqual((const eServiceReferenceDVB&)a, (const eServiceReferenceDVB&)b);
+}
+
 class eDVBServiceBase: public iFrontendInformation
 {
 protected:
-	eDVBServicePMTHandler m_service_handler;
+	eDVBServicePMTHandler m_service_handler	;
 public:
 		// iFrontendInformation
 	int getFrontendInfo(int w);
@@ -73,7 +85,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 +108,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 +141,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);
@@ -146,6 +163,7 @@ public:
 	RESULT enableSubtitles(eWidget *parent, PyObject *entry);
 	RESULT disableSubtitles(eWidget *parent);
 	PyObject *getSubtitleList();
+	PyObject *getCachedSubtitle();
 
 		// iAudioDelay
 	int getAC3Delay();
@@ -227,16 +245,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