X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fservicedvb.h;h=b2306e10b1ac671e9d85b83f32169297b037bc09;hp=d79e6202136c18761168ec8c3cde1e7461e15df1;hb=bb77d424f7eff49ba5be67cdb9c365fa2e305b8f;hpb=ee5fce8acad063a63f8b97e7eb2ad3aa19359325

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index d79e620..b2306e1 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -6,11 +6,18 @@
 
 #include <lib/dvb/pmt.h>
 #include <lib/dvb/eit.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();
@@ -33,14 +40,14 @@ class eDVBServiceList: public iListableService, public iMutableServiceList
 DECLARE_REF(eDVBServiceList);
 public:
 	virtual ~eDVBServiceList();
+	PyObject *getContent(const char* formatstr, bool sorted=false);
 	RESULT getContent(std::list<eServiceReference> &list, bool sorted=false);
-	RESULT getContent(PyObject *list, bool sorted=false);
 	RESULT getNext(eServiceReference &ptr);
 	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);
@@ -55,11 +62,25 @@ 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, public iAudioDelay,
+		public iRadioText
 {
 DECLARE_REF(eDVBServicePlay);
 public:
@@ -74,11 +95,15 @@ 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);
+	RESULT audioDelay(ePtr<iAudioDelay> &ptr);
+	RESULT radioText(ePtr<iRadioText> &ptr);
 
 		// iPauseableService
 	RESULT pause();
@@ -99,15 +124,19 @@ public:
 	RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);
 	int getInfo(int w);
 	std::string getInfoString(int w);
+	PyObject *getInfoObject(int w);
 
 		// iAudioTrackSelection	
 	int getNumberOfTracks();
 	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);
+
+		// iRadioText
+	std::string getRadioText(int i=0);
 
 		// iSubserviceList
 	int getNumberOfSubservices();
@@ -124,6 +153,17 @@ public:
 	void setCutList(PyObject *);
 	void setCutListEnable(int enable);
 	
+		// iSubtitleOutput
+	RESULT enableSubtitles(eWidget *parent, PyObject *entry);
+	RESULT disableSubtitles(eWidget *parent);
+	PyObject *getSubtitleList();
+
+		// iAudioDelay
+	int getAC3Delay();
+	int getPCMDelay();
+	void setAC3Delay(int);
+	void setPCMDelay(int);
+
 private:
 	friend class eServiceFactoryDVB;
 	eServiceReference m_reference;
@@ -132,19 +172,22 @@ 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, m_service_handler_timeshift;
+	eDVBServicePMTHandler m_service_handler_timeshift;
 	eDVBServiceEITHandler m_event_handler;
 	
 	eDVBServicePlay(const eServiceReference &ref, eDVBService *service);
 	
+		/* events */
 	void gotNewEvent();
 	
 	void serviceEvent(int event);
 	void serviceEventTimeshift(int event);
 	Signal2<void,iPlayableService*,int> m_event;
 	
+		/* pvr */
 	int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active;
 	int m_first_program_info;
 	
@@ -152,10 +195,11 @@ private:
 	int m_timeshift_fd;
 	
 	ePtr<iDVBDemux> m_decode_demux;
-	
+
 	int m_current_audio_stream;
 	int selectAudioStream(int n);
 	
+		/* timeshift */
 	ePtr<iDVBTSRecorder> m_record;
 	std::set<int> m_pids_active;
 
@@ -167,6 +211,8 @@ private:
 	
 	int m_skipmode;
 	
+		/* cuesheet */
+	
 	ePtr<eCueSheet> m_cue;
 	
 	struct cueEntry
@@ -191,6 +237,22 @@ private:
 	void saveCuesheet();
 	
 	void cutlistToCuesheet();
+	
+		/* teletext subtitles */
+	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();
+
+		/* radiotext */
+	ePtr<eConnection> m_radiotext_updated_connection;
+	void radioTextUpdated();
 };
 
 #endif