fix

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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 57dca9a0eb20c630fa943c29085af9ac3e2900bc..44d920f8d9ef771c9f919ead65e63c046bf8cad4 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -25,7 +25,9 @@ private:
        RESULT lookupService(ePtr<eDVBService> &ptr, const eServiceReference &ref);
 };
 
-class eDVBServiceList: public iListableService
+class eBouquet;
+
+class eDVBServiceList: public iListableService, public iMutableServiceList
 {
 DECLARE_REF(eDVBServiceList);
 public:
@@ -33,36 +35,28 @@ public:
        RESULT getContent(std::list<eServiceReference> &list);
        RESULT getNext(eServiceReference &ptr);
        int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
+       
+       RESULT startEdit(ePtr<iMutableServiceList> &);
+       RESULT flushChanges();
+       RESULT addService(eServiceReference &ref);
+       RESULT removeService(eServiceReference &ref);
+       RESULT moveService(eServiceReference &ref, int pos);
 private:
        RESULT startQuery();
        eServiceReference m_parent;
        friend class eServiceFactoryDVB;
        eDVBServiceList(const eServiceReference &parent);
        ePtr<iDVBChannelListQuery> m_query;
+       
+               /* for editing purposes. WARNING: lifetime issue! */
+       eBouquet *m_bouquet;
 };
 
-class eDVBServicePlay: public iPlayableService, iSeekableService, public Object, public iServiceInformation
+class eDVBServicePlay: public iPlayableService, public iPauseableService, 
+               public iSeekableService, public Object, public iServiceInformation, 
+               public iAudioTrackSelection
 {
 DECLARE_REF(eDVBServicePlay);
-private:
-       friend class eServiceFactoryDVB;
-       eServiceReference m_reference;
-       
-       ePtr<eDVBService> m_dvb_service;
-       
-       ePtr<iTSMPEGDecoder> m_decoder;
-       
-       eDVBServicePMTHandler m_service_handler;
-       eDVBServiceEITHandler m_event_handler;
-       
-       eDVBServicePlay(const eServiceReference &ref, eDVBService *service);
-       
-       void gotNewEvent();
-       
-       void serviceEvent(int event);
-       Signal2<void,iPlayableService*,int> m_event;
-       
-       int m_is_pvr;
 public:
        virtual ~eDVBServicePlay();
 
@@ -73,15 +67,51 @@ public:
        RESULT seek(ePtr<iSeekableService> &ptr);
        RESULT pause(ePtr<iPauseableService> &ptr);
        RESULT info(ePtr<iServiceInformation> &ptr);
+       RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr);
+       
+               // iPauseableService
+       RESULT pause();
+       RESULT unpause();
        
                // iSeekableService
        RESULT getLength(pts_t &len);
        RESULT seekTo(pts_t to);
+       RESULT seekRelative(int direction, pts_t to);
        RESULT getPlayPosition(pts_t &pos);
 
                // iServiceInformation
        RESULT getName(std::string &name);
        RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);
+       int getInfo(int w);
+       std::string getInfoString(int w);
+
+               // iAudioTrackSelection 
+       int getNumberOfTracks();
+       RESULT selectTrack(unsigned int i);
+       RESULT getTrackInfo(struct iAudioTrackInfo &, unsigned int n);
+
+private:
+       friend class eServiceFactoryDVB;
+       eServiceReference m_reference;
+       
+       ePtr<eDVBService> m_dvb_service;
+       
+       ePtr<iTSMPEGDecoder> m_decoder;
+       
+       eDVBServicePMTHandler m_service_handler;
+       eDVBServiceEITHandler m_event_handler;
+       
+       eDVBServicePlay(const eServiceReference &ref, eDVBService *service);
+       
+       void gotNewEvent();
+       
+       void serviceEvent(int event);
+       Signal2<void,iPlayableService*,int> m_event;
+       
+       int m_is_pvr, m_is_paused;
+       
+       int m_current_audio_stream;
+       int selectAudioStream(int n);
 };
 
 #endif