X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5264f2cd003271ba2c426e21d62d13025dba177b..513a789819efefc582cbabe6a1800f0625605226:/lib/service/iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 3f7a9dc9..df4e302f 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -224,7 +224,7 @@ typedef long long pts_t;
 	   
 	   Hide the result only if there is another way to check for failure! */
 	   
-SWIG_TEMPLATE_TYPEDEF(ePtr<eServiceEvent>, eServiceEventPtr);
+class eServiceEvent;
 
 SWIG_IGNORE(iStaticServiceInformation);
 class iStaticServiceInformation: public iObject
@@ -367,7 +367,10 @@ class iFrontendInformation: public iFrontendInformation_ENUMS, public iObject
 #endif
 public:
 	virtual int getFrontendInfo(int w)=0;
-	virtual PyObject *getFrontendData(bool original=false)=0;
+	virtual PyObject *getFrontendData()=0;
+	virtual PyObject *getFrontendStatus()=0;
+	virtual PyObject *getTransponderData(bool original)=0;
+	virtual PyObject *getAll(bool original)=0; // a sum of getFrontendData/Status/TransponderData
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iFrontendInformation>, iFrontendInformationPtr);
 
@@ -480,17 +483,30 @@ public:
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iAudioDelay>, iAudioDelayPtr);
 
-SWIG_IGNORE(iRadioText);
-class iRadioText: public iObject
+class iRdsDecoder_ENUMS
+{
+#ifdef SWIG
+	iRdsDecoder_ENUMS();
+	~iRdsDecoder_ENUMS();
+#endif
+public:
+	enum { RadioText, RtpText };
+};
+
+SWIG_IGNORE(iRdsDecoder);
+class iRdsDecoder: public iObject, public iRdsDecoder_ENUMS
 {
 #ifdef SWIG
-	iRadioText();
-	~iRadioText();
+	iRdsDecoder();
+	~iRdsDecoder();
 #endif
 public:
-	virtual std::string getRadioText(int x=0)=0;
+	virtual std::string getText(int x=RadioText)=0;
+	virtual void showRassSlidePicture()=0;
+	virtual void showRassInteractivePic(int page, int subpage)=0;
+	virtual SWIG_PYOBJECT(ePyObject) getRassInteractiveMask()=0;
 };
-SWIG_TEMPLATE_TYPEDEF(ePtr<iRadioText>, iRadioTextPtr);
+SWIG_TEMPLATE_TYPEDEF(ePtr<iRdsDecoder>, iRdsDecoderPtr);
 
 SWIG_IGNORE(iSubserviceList);
 class iSubserviceList: public iObject
@@ -673,10 +689,17 @@ public:
 			/* when cueSheet is implemented */
 		evCuesheetChanged,
 
-			/* when radioText is implemented */
+			/* when rdsDecoder is implemented */
 		evUpdatedRadioText,
+		evUpdatedRtpText,
+
+			/* Radio Screenshow Support */
+		evUpdatedRassSlidePic,
+		evUpdatedRassInteractivePicMask,
 
-		evVideoSizeChanged
+		evVideoSizeChanged,
+
+		evStopped
 	};
 };
 
@@ -707,7 +730,7 @@ public:
 	virtual SWIG_VOID(RESULT) cueSheet(ePtr<iCueSheet> &SWIG_OUTPUT)=0;
 	virtual SWIG_VOID(RESULT) subtitle(ePtr<iSubtitleOutput> &SWIG_OUTPUT)=0;
 	virtual SWIG_VOID(RESULT) audioDelay(ePtr<iAudioDelay> &SWIG_OUTPUT)=0;
-	virtual SWIG_VOID(RESULT) radioText(ePtr<iRadioText> &SWIG_OUTPUT)=0;
+	virtual SWIG_VOID(RESULT) rdsDecoder(ePtr<iRdsDecoder> &SWIG_OUTPUT)=0;
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
 
@@ -739,7 +762,7 @@ class iRecordableService_ENUMS
 public:
 	enum {
 		evStart,
-		evStop,
+		evEnd,
 		evTunedIn,
 		evTuneFailed,
 		evRecordRunning,