X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d0899514fa9495013cb73c8ead8c5a5baaf49111..2d01fd232419dbb9edaf7eb42f587dc635d21d42:/lib/service/servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index accdd20d..4b6ef3e1 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -25,41 +25,38 @@ private:
 	RESULT lookupService(ePtr<eDVBService> &ptr, const eServiceReference &ref);
 };
 
-class eDVBServiceList: public iListableService
+class eBouquet;
+
+class eDVBServiceList: public iListableService, public iMutableServiceList
 {
 DECLARE_REF(eDVBServiceList);
-private:
-	eServiceReference m_parent;
-	friend class eServiceFactoryDVB;
-	eDVBServiceList(const eServiceReference &parent);
 public:
 	virtual ~eDVBServiceList();
 	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, public iFrontendStatusInformation
 {
 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();
 
@@ -70,15 +67,55 @@ public:
 	RESULT seek(ePtr<iSeekableService> &ptr);
 	RESULT pause(ePtr<iPauseableService> &ptr);
 	RESULT info(ePtr<iServiceInformation> &ptr);
+	RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr);
+	RESULT frontendStatusInfo(ePtr<iFrontendStatusInformation> &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);
+
+		// iFrontendStatusInformation
+	int getFrontendInfo(int w);
+
+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