add infrastructure for record service events (not finished yet)

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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index b2306e10b1ac671e9d85b83f32169297b037bc09..27f48b5735c8b2c51d0078801c6f8c91fc728926 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,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:
@@ -157,6 +163,7 @@ public:
        RESULT enableSubtitles(eWidget *parent, PyObject *entry);
        RESULT disableSubtitles(eWidget *parent);
        PyObject *getSubtitleList();
+       PyObject *getCachedSubtitle();
 
                // iAudioDelay
        int getAC3Delay();
@@ -238,19 +245,25 @@ 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<eDVBRadioTextParser> m_radiotext_parser;
        ePtr<eConnection> m_radiotext_updated_connection;
        void radioTextUpdated();
 };