add ability to selecte the audio channel (mono left, stereo, mono right) from python

[vuplus_dvbapp] / lib / service / servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 42e3801..79e8d54 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);
        
@@ -57,7 +58,8 @@ private:
 
 class eDVBServicePlay: public iPlayableService, public iPauseableService, 
                public iSeekableService, public Object, public iServiceInformation, 
-               public iAudioTrackSelection, public iFrontendStatusInformation,
+               public iAudioTrackSelection, public iAudioChannelSelection,
+               public iFrontendStatusInformation,
                public iSubserviceList, public iTimeshiftService,
                public iCueSheet
 {
@@ -69,15 +71,17 @@ 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 subServices(ePtr<iSubserviceList> &ptr);
        RESULT timeshift(ePtr<iTimeshiftService> &ptr);
        RESULT cueSheet(ePtr<iCueSheet> &ptr);
-       
 
                // iPauseableService
        RESULT pause();
@@ -98,14 +102,20 @@ 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);
 
+               // iAudioChannelSelection       
+       int getCurrentChannel();
+       RESULT selectChannel(int i);
+
                // iFrontendStatusInformation
        int getFrontendInfo(int w);
+       PyObject *getFrontendData(bool);
 
                // iSubserviceList
        int getNumberOfSubservices();
@@ -120,6 +130,7 @@ public:
                // iCueSheet
        PyObject *getCutList();
        void setCutList(PyObject *);
+       void setCutListEnable(int enable);
        
 private:
        friend class eServiceFactoryDVB;
@@ -128,6 +139,7 @@ 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;
@@ -135,12 +147,14 @@ private:
        
        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;
        
@@ -152,6 +166,7 @@ private:
        int m_current_audio_stream;
        int selectAudioStream(int n);
        
+               /* timeshift */
        ePtr<iDVBTSRecorder> m_record;
        std::set<int> m_pids_active;
 
@@ -163,6 +178,8 @@ private:
        
        int m_skipmode;
        
+               /* cuesheet */
+       
        ePtr<eCueSheet> m_cue;
        
        struct cueEntry
@@ -172,7 +189,7 @@ private:
                
                bool operator < (const struct cueEntry &o) const
                {
-                       return what < o.what;
+                       return where < o.where;
                }
                cueEntry(const pts_t &where, unsigned int what) :
                        where(where), what(what)
@@ -181,10 +198,15 @@ private:
        };
        
        std::multiset<cueEntry> m_cue_entries;
-       int m_cuesheet_changed;
+       int m_cuesheet_changed, m_cutlist_enabled;
        
        void loadCuesheet();
        void saveCuesheet();
+       
+       void cutlistToCuesheet();
+       
+               /* teletext subtitles */
+       ePtr<eDVBTeletextParser> m_teletext_parser;
 };
 
 #endif