fix typo

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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 01eb049756a6301505d54a3e169d8db1d8dfbc17..00aba963efab12da12fca1e643788f2f003db6d8 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -56,11 +56,24 @@ private:
        eBouquet *m_bouquet;
 };
 
-class eDVBServicePlay: public iPlayableService, public iPauseableService, 
+class eDVBServiceBase: public iFrontendInformation
+{
+protected:
+       eDVBServicePMTHandler m_service_handler;
+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 iFrontendStatusInformation,
+               public iAudioTrackSelection, public iAudioChannelSelection,
                public iSubserviceList, public iTimeshiftService,
-               public iCueSheet
+               public iCueSheet, public iSubtitleOutput
 {
 DECLARE_REF(eDVBServicePlay);
 public:
@@ -75,11 +88,13 @@ public:
        RESULT seek(ePtr<iSeekableService> &ptr);
        RESULT pause(ePtr<iPauseableService> &ptr);
        RESULT info(ePtr<iServiceInformation> &ptr);
+       RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr);
        RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr);
-       RESULT frontendStatusInfo(ePtr<iFrontendStatusInformation> &ptr);
+       RESULT frontendInfo(ePtr<iFrontendInformation> &ptr);
        RESULT subServices(ePtr<iSubserviceList> &ptr);
        RESULT timeshift(ePtr<iTimeshiftService> &ptr);
        RESULT cueSheet(ePtr<iCueSheet> &ptr);
+       RESULT subtitle(ePtr<iSubtitleOutput> &ptr);
 
                // iPauseableService
        RESULT pause();
@@ -107,9 +122,9 @@ public:
        RESULT selectTrack(unsigned int i);
        RESULT getTrackInfo(struct iAudioTrackInfo &, unsigned int n);
 
-               // iFrontendStatusInformation
-       int getFrontendInfo(int w);
-       PyObject *getFrontendData(bool);
+               // iAudioChannelSelection       
+       int getCurrentChannel();
+       RESULT selectChannel(int i);
 
                // iSubserviceList
        int getNumberOfSubservices();
@@ -126,6 +141,11 @@ public:
        void setCutList(PyObject *);
        void setCutListEnable(int enable);
        
+               // iSubtitleOutput
+       RESULT enableSubtitles(eWidget *parent, PyObject *entry);
+       RESULT disableSubtitles(eWidget *parent);
+       PyObject *getSubtitleList();
+
 private:
        friend class eServiceFactoryDVB;
        eServiceReference m_reference;
@@ -136,7 +156,7 @@ private:
        int m_is_primary;
        
                /* in timeshift mode, we essentially have two channels, and thus pmt handlers. */
-       eDVBServicePMTHandler m_service_handler, m_service_handler_timeshift;
+       eDVBServicePMTHandler m_service_handler_timeshift;
        eDVBServiceEITHandler m_event_handler;
        
        eDVBServicePlay(const eServiceReference &ref, eDVBService *service);
@@ -200,7 +220,11 @@ private:
        void cutlistToCuesheet();
        
                /* teletext subtitles */
+       void newSubtitlePage(const eDVBTeletextSubtitlePage &p);
+       ePtr<eConnection> m_new_subtitle_page_connection;
+       
        ePtr<eDVBTeletextParser> m_teletext_parser;
+       eSubtitleWidget *m_subtitle_widget;
 };
 
 #endif