X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c9fe752d20d7ee28b56b863b6469b3490c17f4a2..2ab514e090cb4f0dc14faa061820d9d154b37647:/lib/service/iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index ca84a410..84356be8 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
@@ -354,7 +354,8 @@ public:
 		signalQuality,
 		lockState,
 		syncState,
-		frontendNumber
+		frontendNumber,
+		signalPowerdB,
 	};
 };
 
@@ -367,7 +368,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 +484,30 @@ public:
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iAudioDelay>, iAudioDelayPtr);
 
-SWIG_IGNORE(iRadioText);
-class iRadioText: public iObject
+class iRdsDecoder_ENUMS
 {
 #ifdef SWIG
-	iRadioText();
-	~iRadioText();
+	iRdsDecoder_ENUMS();
+	~iRdsDecoder_ENUMS();
 #endif
 public:
-	virtual std::string getRadioText(int x=0)=0;
+	enum { RadioText, RtpText };
 };
-SWIG_TEMPLATE_TYPEDEF(ePtr<iRadioText>, iRadioTextPtr);
+
+SWIG_IGNORE(iRdsDecoder);
+class iRdsDecoder: public iObject, public iRdsDecoder_ENUMS
+{
+#ifdef SWIG
+	iRdsDecoder();
+	~iRdsDecoder();
+#endif
+public:
+	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<iRdsDecoder>, iRdsDecoderPtr);
 
 SWIG_IGNORE(iSubserviceList);
 class iSubserviceList: public iObject
@@ -673,13 +690,22 @@ public:
 			/* when cueSheet is implemented */
 		evCuesheetChanged,
 
-			/* when radioText is implemented */
+			/* when rdsDecoder is implemented */
 		evUpdatedRadioText,
+		evUpdatedRtpText,
+
+			/* Radio Screenshow Support */
+		evUpdatedRassSlidePic,
+		evUpdatedRassInteractivePicMask,
+
+		evVideoSizeChanged,
 
-		evVideoSizeChanged
+		evStopped
 	};
 };
 
+class iStreamableService;
+
 SWIG_IGNORE(iPlayableService);
 class iPlayableService: public iPlayableService_ENUMS, public iObject
 {
@@ -707,10 +733,30 @@ 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;
+	virtual SWIG_VOID(RESULT) stream(ePtr<iStreamableService> &SWIG_OUTPUT)=0;
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
 
+SWIG_IGNORE(iStreamableService);
+class iStreamableService: public iObject
+{
+#ifdef SWIG
+	iStreamableService();
+	~iStreamableService();
+#endif
+public:
+		/* returns a dict:
+			{ "demux": <n>,
+			  "pids": [(x,type),(y,type),(z,type),..],
+			  ...
+			}
+			with type being "video", "audio", "pmt", "pat"...
+		*/
+	virtual PyObject *getStreamingData()=0;
+};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iStreamableService>, iStreamableServicePtr);
+
 class iRecordableService_ENUMS
 {
 #ifdef SWIG
@@ -720,14 +766,14 @@ class iRecordableService_ENUMS
 public:
 	enum {
 		evStart,
-		evStop,
+		evEnd,
 		evTunedIn,
 		evTuneFailed,
 		evRecordRunning,
 		evRecordStopped,
 		evNewProgramInfo,
-		evRecordFailed
-		/*evDiskFull*/
+		evRecordFailed,
+		evRecordWriteError
 	};
 	enum {
 		NoError=0,
@@ -752,9 +798,11 @@ public:
 #endif
 	virtual SWIG_VOID(RESULT) getError(int &SWIG_OUTPUT)=0;
 	virtual RESULT prepare(const char *filename, time_t begTime=-1, time_t endTime=-1, int eit_event_id=-1)=0;
+	virtual RESULT prepareStreaming()=0;
 	virtual RESULT start()=0;
 	virtual RESULT stop()=0;
 	virtual SWIG_VOID(RESULT) frontendInfo(ePtr<iFrontendInformation> &SWIG_OUTPUT)=0;
+	virtual SWIG_VOID(RESULT) stream(ePtr<iStreamableService> &SWIG_OUTPUT)=0;
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iRecordableService>, iRecordableServicePtr);