use hex instead of decimal

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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index c765e0e383ab00b39a5661609758b29c9cd5a2b9..d725087cd21fecee759a3c15b5cf7e2f637bd306 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -75,7 +75,10 @@ protected:
 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();
@@ -215,7 +221,7 @@ private:
        void switchToLive();
        void switchToTimeshift();
        
-       void updateDecoder();
+       void updateDecoder(int intopause=0);
        
        int m_skipmode;
        
@@ -264,9 +270,9 @@ 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);