X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/95c570d26ce81e3dd1e0610ff6c5c0b34d75ba5a..9e0b367cd7017f8abf3e3ea804966ce6e23a768f:/lib/service/servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 5e0cf0b4..6eba5064 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -38,13 +38,13 @@ class eBouquet;
 
 class eDVBServiceList: public iListableService, public iMutableServiceList
 {
-DECLARE_REF(eDVBServiceList);
+	DECLARE_REF(eDVBServiceList);
 public:
 	virtual ~eDVBServiceList();
 	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();
@@ -63,17 +63,25 @@ 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);
-	PyObject *getFrontendData(bool);
+	PyObject *getFrontendData();
+	PyObject *getFrontendStatus();
+	PyObject *getTransponderData(bool);
+	PyObject *getAll(bool original); // a sum of getFrontendData/Status/TransponderData
 };
 
-class eSubtitleWidget; 
+class eSubtitleWidget;
 
 class eDVBServicePlay: public eDVBServiceBase,
 		public iPlayableService, public iPauseableService, 
@@ -81,9 +89,9 @@ class eDVBServicePlay: public eDVBServiceBase,
 		public iAudioTrackSelection, public iAudioChannelSelection,
 		public iSubserviceList, public iTimeshiftService,
 		public iCueSheet, public iSubtitleOutput, public iAudioDelay,
-		public iRadioText
+		public iRdsDecoder, public iStreamableService
 {
-DECLARE_REF(eDVBServicePlay);
+	DECLARE_REF(eDVBServicePlay);
 public:
 	virtual ~eDVBServicePlay();
 
@@ -104,14 +112,16 @@ public:
 	RESULT cueSheet(ePtr<iCueSheet> &ptr);
 	RESULT subtitle(ePtr<iSubtitleOutput> &ptr);
 	RESULT audioDelay(ePtr<iAudioDelay> &ptr);
-	RESULT radioText(ePtr<iRadioText> &ptr);
+	RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr);
+	RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }
+	RESULT streamed(ePtr<iStreamedService> &ptr) { ptr = 0; return -1; }
 
 		// iPauseableService
 	RESULT pause();
 	RESULT unpause();
 	RESULT setSlowMotion(int ratio);
 	RESULT setFastForward(int ratio);
-    	
+
 		// iSeekableService
 	RESULT getLength(pts_t &len);
 	RESULT seekTo(pts_t to);
@@ -131,13 +141,17 @@ public:
 	int getNumberOfTracks();
 	RESULT selectTrack(unsigned int i);
 	RESULT getTrackInfo(struct iAudioTrackInfo &, unsigned int n);
+	int getCurrentTrack();
 
 		// iAudioChannelSelection	
 	int getCurrentChannel();
 	RESULT selectChannel(int i);
 
-		// iRadioText
-	std::string getRadioText(int i=0);
+		// iRdsDecoder
+	std::string getText(int i=0);
+	void showRassSlidePicture();
+	void showRassInteractivePic(int page, int subpage);
+	ePyObject getRassInteractiveMask();
 
 		// iSubserviceList
 	int getNumberOfSubservices();
@@ -151,11 +165,11 @@ public:
 
 		// iCueSheet
 	PyObject *getCutList();
-	void setCutList(PyObject *);
+	void setCutList(SWIG_PYOBJECT(ePyObject));
 	void setCutListEnable(int enable);
 	
 		// iSubtitleOutput
-	RESULT enableSubtitles(eWidget *parent, PyObject *entry);
+	RESULT enableSubtitles(eWidget *parent, SWIG_PYOBJECT(ePyObject) entry);
 	RESULT disableSubtitles(eWidget *parent);
 	PyObject *getSubtitleList();
 	PyObject *getCachedSubtitle();
@@ -165,6 +179,10 @@ public:
 	int getPCMDelay();
 	void setAC3Delay(int);
 	void setPCMDelay(int);
+	
+		// iStreamableService
+	RESULT stream(ePtr<iStreamableService> &ptr);
+	PyObject *getStreamingData();
 
 private:
 	friend class eServiceFactoryDVB;
@@ -175,10 +193,12 @@ private:
 	ePtr<iTSMPEGDecoder> m_decoder;
 	int m_is_primary;
 	int m_have_video_pid;
+	int m_tune_state;
 	
 		/* in timeshift mode, we essentially have two channels, and thus pmt handlers. */
 	eDVBServicePMTHandler m_service_handler_timeshift;
 	eDVBServiceEITHandler m_event_handler;
+	int m_current_audio_pid;
 	
 	eDVBServicePlay(const eServiceReference &ref, eDVBService *service);
 	
@@ -199,7 +219,8 @@ private:
 	ePtr<iDVBDemux> m_decode_demux;
 
 	int m_current_audio_stream;
-	int selectAudioStream(int n);
+	int selectAudioStream(int n = -1);
+	RESULT setFastForward_internal(int ratio);
 	
 		/* timeshift */
 	ePtr<iDVBTSRecorder> m_record;
@@ -254,13 +275,28 @@ private:
 	ePtr<eConnection> m_new_dvb_subtitle_page_connection;
 	std::list<eDVBSubtitlePage> m_dvb_subtitle_pages;
 
-	eTimer m_subtitle_sync_timer;
+	ePtr<eTimer> m_subtitle_sync_timer;
 	void checkSubtitleTiming();
 
 		/* radiotext */
-	ePtr<eDVBRadioTextParser> m_radiotext_parser;
-	ePtr<eConnection> m_radiotext_updated_connection;
-	void radioTextUpdated();
+	ePtr<eDVBRdsDecoder> m_rds_decoder;
+	ePtr<eConnection> m_rds_decoder_event_connection;
+	void rdsDecoderEvent(int);
+
+	ePtr<eConnection> m_video_event_connection;
+	void video_event(struct iTSMPEGDecoder::videoEvent);
+};
+
+class eStaticServiceDVBBouquetInformation: public iStaticServiceInformation
+{
+	DECLARE_REF(eStaticServiceDVBBouquetInformation);
+	eServiceReference m_playable_service;
+public:
+	eServiceReference &getPlayableService() { return m_playable_service; }
+	RESULT getName(const eServiceReference &ref, std::string &name);
+	int getLength(const eServiceReference &ref);
+	int isPlayable(const eServiceReference &ref, const eServiceReference &ignore, bool simulate=false);
+	RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time);
 };
 
 #endif