initialize self.list

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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index da30732401f4cf55be1eccee5ec75e67bfe66a16..789edbea701b396e088a12450a8e238747f49ef3 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -6,12 +6,19 @@
 
 #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>
 
+class eStaticServiceDVBInformation;
+class eStaticServiceDVBBouquetInformation;
+
 class eServiceFactoryDVB: public iServiceHandler
 {
-DECLARE_REF(eServiceFactoryDVB);
+       DECLARE_REF(eServiceFactoryDVB);
+       ePtr<eStaticServiceDVBInformation> m_StaticServiceDVBInfo;
+       ePtr<eStaticServiceDVBBouquetInformation> m_StaticServiceDVBBouquetInfo;
 public:
        eServiceFactoryDVB();
        virtual ~eServiceFactoryDVB();
@@ -37,11 +44,11 @@ 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();
-       RESULT addService(eServiceReference &ref);
+       RESULT addService(eServiceReference &ref, eServiceReference before);
        RESULT removeService(eServiceReference &ref);
        RESULT moveService(eServiceReference &ref, int pos);
        RESULT setListName(const std::string &name);
@@ -56,6 +63,11 @@ 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:
@@ -63,15 +75,21 @@ 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; 
+
 class eDVBServicePlay: public eDVBServiceBase,
                public iPlayableService, public iPauseableService, 
                public iSeekableService, public Object, public iServiceInformation, 
                public iAudioTrackSelection, public iAudioChannelSelection,
                public iSubserviceList, public iTimeshiftService,
-               public iCueSheet
+               public iCueSheet, public iSubtitleOutput, public iAudioDelay,
+               public iRdsDecoder, public iStreamableService
 {
 DECLARE_REF(eDVBServicePlay);
 public:
@@ -92,6 +110,9 @@ public:
        RESULT subServices(ePtr<iSubserviceList> &ptr);
        RESULT timeshift(ePtr<iTimeshiftService> &ptr);
        RESULT cueSheet(ePtr<iCueSheet> &ptr);
+       RESULT subtitle(ePtr<iSubtitleOutput> &ptr);
+       RESULT audioDelay(ePtr<iAudioDelay> &ptr);
+       RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr);
 
                // iPauseableService
        RESULT pause();
@@ -118,11 +139,18 @@ public:
        int getNumberOfTracks();
        RESULT selectTrack(unsigned int i);
        RESULT getTrackInfo(struct iAudioTrackInfo &, unsigned int n);
+       int getCurrentTrack();
 
                // iAudioChannelSelection       
        int getCurrentChannel();
        RESULT selectChannel(int i);
 
+               // iRdsDecoder
+       std::string getText(int i=0);
+       void showRassSlidePicture();
+       void showRassInteractivePic(int page, int subpage);
+       ePyObject getRassInteractiveMask();
+
                // iSubserviceList
        int getNumberOfSubservices();
        RESULT getSubservice(eServiceReference &subservice, unsigned int n);
@@ -135,9 +163,24 @@ public:
 
                // iCueSheet
        PyObject *getCutList();
-       void setCutList(PyObject *);
+       void setCutList(SWIG_PYOBJECT(ePyObject));
        void setCutListEnable(int enable);
        
+               // iSubtitleOutput
+       RESULT enableSubtitles(eWidget *parent, SWIG_PYOBJECT(ePyObject) entry);
+       RESULT disableSubtitles(eWidget *parent);
+       PyObject *getSubtitleList();
+       PyObject *getCachedSubtitle();
+
+               // iAudioDelay
+       int getAC3Delay();
+       int getPCMDelay();
+       void setAC3Delay(int);
+       void setPCMDelay(int);
+       
+               // iStreamableService
+       RESULT stream(ePtr<iStreamableService> &ptr);
+       PyObject *getStreamingData();
 private:
        friend class eServiceFactoryDVB;
        eServiceReference m_reference;
@@ -146,10 +189,13 @@ 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;
        eDVBServiceEITHandler m_event_handler;
+       int m_current_audio_pid;
        
        eDVBServicePlay(const eServiceReference &ref, eDVBService *service);
        
@@ -168,9 +214,9 @@ private:
        int m_timeshift_fd;
        
        ePtr<iDVBDemux> m_decode_demux;
-       
+
        int m_current_audio_stream;
-       int selectAudioStream(int n);
+       int selectAudioStream(int n = -1);
        
                /* timeshift */
        ePtr<iDVBTSRecorder> m_record;
@@ -211,8 +257,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;
+       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<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