use hex instead of decimal

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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index b2306e10b1ac671e9d85b83f32169297b037bc09..d725087cd21fecee759a3c15b5cf7e2f637bd306 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -6,6 +6,7 @@
 
 #include <lib/dvb/pmt.h>
 #include <lib/dvb/eit.h>
+#include <lib/dvb/subtitle.h>
 #include <lib/dvb/teletext.h>
 #include <lib/dvb/radiotext.h>
 #include <lib/base/filepush.h>
@@ -43,7 +44,7 @@ public:
        PyObject *getContent(const char* formatstr, bool sorted=false);
        RESULT getContent(std::list<eServiceReference> &list, bool sorted=false);
        RESULT getNext(eServiceReference &ptr);
-       int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
+       inline int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
        
        RESULT startEdit(ePtr<iMutableServiceList> &);
        RESULT flushChanges();
@@ -62,14 +63,22 @@ private:
        eBouquet *m_bouquet;
 };
 
+inline int eDVBServiceList::compareLessEqual(const eServiceReference &a, const eServiceReference &b)
+{
+       return m_query->compareLessEqual((const eServiceReferenceDVB&)a, (const eServiceReferenceDVB&)b);
+}
+
 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; 
@@ -80,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:
@@ -103,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();
@@ -135,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();
@@ -150,13 +162,14 @@ public:
 
                // iCueSheet
        PyObject *getCutList();
-       void setCutList(PyObject *);
+       void setCutList(SWIG_PYOBJECT(ePyObject));
        void setCutListEnable(int enable);
        
                // iSubtitleOutput
-       RESULT enableSubtitles(eWidget *parent, PyObject *entry);
+       RESULT enableSubtitles(eWidget *parent, SWIG_PYOBJECT(ePyObject) entry);
        RESULT disableSubtitles(eWidget *parent);
        PyObject *getSubtitleList();
+       PyObject *getCachedSubtitle();
 
                // iAudioDelay
        int getAC3Delay();
@@ -173,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;
@@ -207,7 +221,7 @@ private:
        void switchToLive();
        void switchToTimeshift();
        
-       void updateDecoder();
+       void updateDecoder(int intopause=0);
        
        int m_skipmode;
        
@@ -238,21 +252,43 @@ private:
        
        void cutlistToCuesheet();
        
+       eSubtitleWidget *m_subtitle_widget;
+       
                /* teletext subtitles */
+       ePtr<eDVBTeletextParser> m_teletext_parser;
        void newSubtitlePage(const eDVBTeletextSubtitlePage &p);
        ePtr<eConnection> m_new_subtitle_page_connection;
-       
-       ePtr<eDVBTeletextParser> m_teletext_parser;
-       ePtr<eDVBRadioTextParser> m_radiotext_parser;
-       eSubtitleWidget *m_subtitle_widget;
-       eTimer m_subtitle_sync_timer;
        std::list<eDVBTeletextSubtitlePage> m_subtitle_pages;
        
+               /* dvb subtitles */
+       ePtr<eDVBSubtitleParser> m_subtitle_parser;
+       void newDVBSubtitlePage(const eDVBSubtitlePage &p);
+       ePtr<eConnection> m_new_dvb_subtitle_page_connection;
+       std::list<eDVBSubtitlePage> m_dvb_subtitle_pages;
+
+       eTimer m_subtitle_sync_timer;
        void checkSubtitleTiming();
 
                /* radiotext */
-       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
+{
+       DECLARE_REF(eStaticServiceDVBBouquetInformation);
+       eServiceReference m_playable_service;
+public:
+       eServiceReference &getPlayableService() { return m_playable_service; }
+       RESULT getName(const eServiceReference &ref, std::string &name);
+       int getLength(const eServiceReference &ref);
+       int isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+       RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time);
 };
 
 #endif