fix EventInfo to pull on query

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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 85653caa8eff798b6c22e849592c74aec48545dd..8026d6558bb1a9f84188afd7ccb4308daa2eb834 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -73,7 +73,7 @@ class eDVBServicePlay: public eDVBServiceBase,
                public iSeekableService, public Object, public iServiceInformation, 
                public iAudioTrackSelection, public iAudioChannelSelection,
                public iSubserviceList, public iTimeshiftService,
-               public iCueSheet, public iSubtitleOutput
+               public iCueSheet, public iSubtitleOutput, public iAudioDelay
 {
 DECLARE_REF(eDVBServicePlay);
 public:
@@ -95,6 +95,7 @@ public:
        RESULT timeshift(ePtr<iTimeshiftService> &ptr);
        RESULT cueSheet(ePtr<iCueSheet> &ptr);
        RESULT subtitle(ePtr<iSubtitleOutput> &ptr);
+       RESULT audioDelay(ePtr<iAudioDelay> &ptr);      
 
                // iPauseableService
        RESULT pause();
@@ -142,9 +143,15 @@ public:
        void setCutListEnable(int enable);
        
                // iSubtitleOutput
-       RESULT enableSubtitles(eWidget *parent, int index);
+       RESULT enableSubtitles(eWidget *parent, PyObject *entry);
        RESULT disableSubtitles(eWidget *parent);
-       SWIG_VOID(RESULT) getSubtitleList(PyList *list);
+       PyObject *getSubtitleList();
+
+               // iAudioDelay
+       int getAC3Delay();
+       int getPCMDelay();
+       void setAC3Delay(int);
+       void setPCMDelay(int);
 
 private:
        friend class eServiceFactoryDVB;
@@ -154,6 +161,7 @@ private:
        
        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;
@@ -176,7 +184,7 @@ private:
        int m_timeshift_fd;
        
        ePtr<iDVBDemux> m_decode_demux;
-       
+
        int m_current_audio_stream;
        int selectAudioStream(int n);
        
@@ -225,6 +233,10 @@ private:
        
        ePtr<eDVBTeletextParser> m_teletext_parser;
        eSubtitleWidget *m_subtitle_widget;
+       eTimer m_subtitle_sync_timer;
+       std::list<eDVBTeletextSubtitlePage> m_subtitle_pages;
+       
+       void checkSubtitleTiming();
 };
 
 #endif