add setInfo / setInfoString for iServiceInformation and iStaticServiceInformation

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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index da30732401f4cf55be1eccee5ec75e67bfe66a16..62d341692609bd11dc20bc25ae0e6febe270e43e 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/pmt.h>
 #include <lib/dvb/eit.h>

+#include <lib/dvb/subtitle.h>

 #include <lib/dvb/teletext.h>
 #include <lib/dvb/teletext.h>

+#include <lib/dvb/radiotext.h>

 #include <lib/base/filepush.h>
 
 #include <lib/base/filepush.h>
 

+class eStaticServiceDVBInformation;
+class eStaticServiceDVBBouquetInformation;
+

 class eServiceFactoryDVB: public iServiceHandler
 {
 class eServiceFactoryDVB: public iServiceHandler
 {

-DECLARE_REF(eServiceFactoryDVB);
+       DECLARE_REF(eServiceFactoryDVB);
+       ePtr<eStaticServiceDVBInformation> m_StaticServiceDVBInfo;
+       ePtr<eStaticServiceDVBBouquetInformation> m_StaticServiceDVBBouquetInfo;

 public:
        eServiceFactoryDVB();
        virtual ~eServiceFactoryDVB();
 public:
        eServiceFactoryDVB();
        virtual ~eServiceFactoryDVB();


@@ -41,7 +48,7 @@ public:
        
        RESULT startEdit(ePtr<iMutableServiceList> &);
        RESULT flushChanges();
        
        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);
        RESULT removeService(eServiceReference &ref);
        RESULT moveService(eServiceReference &ref, int pos);
        RESULT setListName(const std::string &name);


@@ -59,19 +66,22 @@ private:
 class eDVBServiceBase: public iFrontendInformation
 {
 protected:
 class eDVBServiceBase: public iFrontendInformation
 {
 protected:

-       eDVBServicePMTHandler m_service_handler;
+       eDVBServicePMTHandler m_service_handler ;

 public:
                // iFrontendInformation
        int getFrontendInfo(int w);
        PyObject *getFrontendData(bool);
 };
 
 public:
                // iFrontendInformation
        int getFrontendInfo(int w);
        PyObject *getFrontendData(bool);
 };
 

+class eSubtitleWidget; 
+

 class eDVBServicePlay: public eDVBServiceBase,
                public iPlayableService, public iPauseableService, 
                public iSeekableService, public Object, public iServiceInformation, 
                public iAudioTrackSelection, public iAudioChannelSelection,
                public iSubserviceList, public iTimeshiftService,
 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 iRadioText

 {
 DECLARE_REF(eDVBServicePlay);
 public:
 {
 DECLARE_REF(eDVBServicePlay);
 public:


@@ -92,6 +102,9 @@ public:
        RESULT subServices(ePtr<iSubserviceList> &ptr);
        RESULT timeshift(ePtr<iTimeshiftService> &ptr);
        RESULT cueSheet(ePtr<iCueSheet> &ptr);
        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 radioText(ePtr<iRadioText> &ptr);

 
                // iPauseableService
        RESULT pause();
 
                // iPauseableService
        RESULT pause();


@@ -123,6 +136,9 @@ public:
        int getCurrentChannel();
        RESULT selectChannel(int i);
 
        int getCurrentChannel();
        RESULT selectChannel(int i);
 

+               // iRadioText
+       std::string getRadioText(int i=0);
+

                // iSubserviceList
        int getNumberOfSubservices();
        RESULT getSubservice(eServiceReference &subservice, unsigned int n);
                // iSubserviceList
        int getNumberOfSubservices();
        RESULT getSubservice(eServiceReference &subservice, unsigned int n);


@@ -138,6 +154,17 @@ public:
        void setCutList(PyObject *);
        void setCutListEnable(int enable);
        
        void setCutList(PyObject *);
        void setCutListEnable(int enable);
        

+               // iSubtitleOutput
+       RESULT enableSubtitles(eWidget *parent, PyObject *entry);
+       RESULT disableSubtitles(eWidget *parent);
+       PyObject *getSubtitleList();
+
+               // iAudioDelay
+       int getAC3Delay();
+       int getPCMDelay();
+       void setAC3Delay(int);
+       void setPCMDelay(int);
+

 private:
        friend class eServiceFactoryDVB;
        eServiceReference m_reference;
 private:
        friend class eServiceFactoryDVB;
        eServiceReference m_reference;


@@ -146,6 +173,7 @@ private:
        
        ePtr<iTSMPEGDecoder> m_decoder;
        int m_is_primary;
        
        ePtr<iTSMPEGDecoder> m_decoder;
        int m_is_primary;

+       int m_have_video_pid;

        
                /* in timeshift mode, we essentially have two channels, and thus pmt handlers. */
        eDVBServicePMTHandler m_service_handler_timeshift;
        
                /* in timeshift mode, we essentially have two channels, and thus pmt handlers. */
        eDVBServicePMTHandler m_service_handler_timeshift;


@@ -168,7 +196,7 @@ private:
        int m_timeshift_fd;
        
        ePtr<iDVBDemux> m_decode_demux;
        int m_timeshift_fd;
        
        ePtr<iDVBDemux> m_decode_demux;

-       
+

        int m_current_audio_stream;
        int selectAudioStream(int n);
        
        int m_current_audio_stream;
        int selectAudioStream(int n);
        


@@ -211,8 +239,27 @@ private:
        
        void cutlistToCuesheet();
        
        
        void cutlistToCuesheet();
        

+       eSubtitleWidget *m_subtitle_widget;
+       

                /* teletext subtitles */
        ePtr<eDVBTeletextParser> m_teletext_parser;
                /* 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<eDVBRadioTextParser> m_radiotext_parser;
+       ePtr<eConnection> m_radiotext_updated_connection;
+       void radioTextUpdated();

 };
 
 #endif
 };
 
 #endif