no more segfault when opening audio track/channel selection on subservices

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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 85653caa8eff798b6c22e849592c74aec48545dd..42457598d401cee9bbc7ce5adfb1245ececb31fd 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -142,9 +142,9 @@ 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();
 
 private:
        friend class eServiceFactoryDVB;
@@ -176,7 +176,8 @@ private:
        int m_timeshift_fd;
        
        ePtr<iDVBDemux> m_decode_demux;
-       
+
+       int m_current_audio_channel;
        int m_current_audio_stream;
        int selectAudioStream(int n);
        
@@ -225,6 +226,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