finally implement proper clipping for texts

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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 39318b2297df89c3fe6de069ee97d8deecb34784..da30732401f4cf55be1eccee5ec75e67bfe66a16 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/teletext.h>
 #include <lib/base/filepush.h>
 
 class eServiceFactoryDVB: public iServiceHandler
@@ -33,8 +34,8 @@ class eDVBServiceList: public iListableService, public iMutableServiceList
 DECLARE_REF(eDVBServiceList);
 public:
        virtual ~eDVBServiceList();
+       PyObject *getContent(const char* formatstr, bool sorted=false);
        RESULT getContent(std::list<eServiceReference> &list, bool sorted=false);
-       RESULT getContent(PyObject *list, bool sorted=false);
        RESULT getNext(eServiceReference &ptr);
        int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
        
@@ -55,9 +56,20 @@ 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 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
 {
@@ -69,11 +81,14 @@ public:
        RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection);
        RESULT start();
        RESULT stop();
+       RESULT setTarget(int target);
+       
        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);
@@ -97,15 +112,16 @@ public:
        RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);
        int getInfo(int w);
        std::string getInfoString(int w);
+       PyObject *getInfoObject(int w);
 
                // iAudioTrackSelection 
        int getNumberOfTracks();
        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();
@@ -129,19 +145,22 @@ private:
        ePtr<eDVBService> m_dvb_service;
        
        ePtr<iTSMPEGDecoder> m_decoder;
+       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);
        
+               /* events */
        void gotNewEvent();
        
        void serviceEvent(int event);
        void serviceEventTimeshift(int event);
        Signal2<void,iPlayableService*,int> m_event;
        
+               /* pvr */
        int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active;
        int m_first_program_info;
        
@@ -153,6 +172,7 @@ private:
        int m_current_audio_stream;
        int selectAudioStream(int n);
        
+               /* timeshift */
        ePtr<iDVBTSRecorder> m_record;
        std::set<int> m_pids_active;
 
@@ -164,6 +184,8 @@ private:
        
        int m_skipmode;
        
+               /* cuesheet */
+       
        ePtr<eCueSheet> m_cue;
        
        struct cueEntry
@@ -188,6 +210,9 @@ private:
        void saveCuesheet();
        
        void cutlistToCuesheet();
+       
+               /* teletext subtitles */
+       ePtr<eDVBTeletextParser> m_teletext_parser;
 };
 
 #endif