add some debug output for subtitles

[enigma2.git] / lib / service / iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 96cd792d7b1546c03ba17381e6585e97face1428..0b03feb4a88a7e9da653f7f3f502cafed3af0b09 100644 (file)
--- 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! */
           
           
           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
 
 SWIG_IGNORE(iStaticServiceInformation);
 class iStaticServiceInformation: public iObject


@@ -354,7 +354,8 @@ public:
                signalQuality,
                lockState,
                syncState,
                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;
 #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);
 
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iFrontendInformation>, iFrontendInformationPtr);
 


@@ -422,9 +426,11 @@ struct iAudioTrackInfo
 #ifndef SWIG
        std::string m_description;
        std::string m_language; /* iso639 */
 #ifndef SWIG
        std::string m_description;
        std::string m_language; /* iso639 */

+       int m_pid; /* for association with the stream. */

 #endif
        std::string getDescription() { return m_description; }
        std::string getLanguage() { return m_language; }
 #endif
        std::string getDescription() { return m_description; }
        std::string getLanguage() { return m_language; }

+       int getPID() { return m_pid; }

 };
 SWIG_ALLOW_OUTPUT_SIMPLE(iAudioTrackInfo);
 
 };
 SWIG_ALLOW_OUTPUT_SIMPLE(iAudioTrackInfo);
 


@@ -439,6 +445,7 @@ public:
        virtual int getNumberOfTracks()=0;
        virtual RESULT selectTrack(unsigned int i)=0;
        virtual SWIG_VOID(RESULT) getTrackInfo(struct iAudioTrackInfo &SWIG_OUTPUT, unsigned int n)=0;
        virtual int getNumberOfTracks()=0;
        virtual RESULT selectTrack(unsigned int i)=0;
        virtual SWIG_VOID(RESULT) getTrackInfo(struct iAudioTrackInfo &SWIG_OUTPUT, unsigned int n)=0;

+       virtual int getCurrentTrack()=0;

 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iAudioTrackSelection>, iAudioTrackSelectionPtr);
 
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iAudioTrackSelection>, iAudioTrackSelectionPtr);
 


@@ -480,17 +487,30 @@ public:
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iAudioDelay>, iAudioDelayPtr);
 
 };
 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
 {
 #ifdef SWIG

-       iRadioText();
-       ~iRadioText();
+       iRdsDecoder();
+       ~iRdsDecoder();

 #endif
 public:
 #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
 
 SWIG_IGNORE(iSubserviceList);
 class iSubserviceList: public iObject


@@ -673,8 +693,13 @@ public:
                        /* when cueSheet is implemented */
                evCuesheetChanged,
 
                        /* when cueSheet is implemented */
                evCuesheetChanged,
 

-                       /* when radioText is implemented */
+                       /* when rdsDecoder is implemented */

                evUpdatedRadioText,
                evUpdatedRadioText,

+               evUpdatedRtpText,
+
+                       /* Radio Screenshow Support */
+               evUpdatedRassSlidePic,
+               evUpdatedRassInteractivePicMask,

 
                evVideoSizeChanged,
 
 
                evVideoSizeChanged,
 


@@ -682,6 +707,8 @@ public:
        };
 };
 
        };
 };
 

+class iStreamableService;
+

 SWIG_IGNORE(iPlayableService);
 class iPlayableService: public iPlayableService_ENUMS, public iObject
 {
 SWIG_IGNORE(iPlayableService);
 class iPlayableService: public iPlayableService_ENUMS, public iObject
 {


@@ -709,7 +736,8 @@ 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) 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_TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
 


@@ -747,8 +775,8 @@ public:
                evRecordRunning,
                evRecordStopped,
                evNewProgramInfo,
                evRecordRunning,
                evRecordStopped,
                evNewProgramInfo,

-               evRecordFailed
-               /*evDiskFull*/
+               evRecordFailed,
+               evRecordWriteError

        };
        enum {
                NoError=0,
        };
        enum {
                NoError=0,