reset cached program on audio pid change (this fixes audio pid in service

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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 0be174e28c22af5d834e49a3aeade9d8f9ea8ec5..62d341692609bd11dc20bc25ae0e6febe270e43e 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -6,13 +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();
@@ -233,19 +239,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();
 };