X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2b557e7ef4b0518736c5162a501cd9bc743930b3..1573e3dc168002939adff026d11e60359ba1d3ad:/lib/service/servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index b3978a42..d725087c 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -71,11 +71,14 @@ inline int eDVBServiceList::compareLessEqual(const eServiceReference &a, const e
 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; 
@@ -86,7 +89,7 @@ class eDVBServicePlay: public eDVBServiceBase,
 		public iAudioTrackSelection, public iAudioChannelSelection,
 		public iSubserviceList, public iTimeshiftService,
 		public iCueSheet, public iSubtitleOutput, public iAudioDelay,
-		public iRadioText
+		public iRdsDecoder
 {
 DECLARE_REF(eDVBServicePlay);
 public:
@@ -109,7 +112,7 @@ 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);
 
 		// iPauseableService
 	RESULT pause();
@@ -141,8 +144,11 @@ public:
 	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();
@@ -180,6 +186,7 @@ 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;
@@ -214,7 +221,7 @@ private:
 	void switchToLive();
 	void switchToTimeshift();
 	
-	void updateDecoder();
+	void updateDecoder(int intopause=0);
 	
 	int m_skipmode;
 	
@@ -263,9 +270,13 @@ private:
 	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);
+	struct iTSMPEGDecoder::videoEvent m_videoEventData;
 };
 
 class eStaticServiceDVBBouquetInformation: public iStaticServiceInformation