X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e933d514f93eb0690cf071c24f127017f9b80716..5cdabb1038ec3f628001f26f5d587eb95ca6465d:/lib/service/servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 5dd2f3b2..31eee1fe 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -20,51 +20,93 @@ public:
 	RESULT record(const eServiceReference &, ePtr<iRecordableService> &ptr);
 	RESULT list(const eServiceReference &, ePtr<iListableService> &ptr);
 	RESULT info(const eServiceReference &, ePtr<iStaticServiceInformation> &ptr);
+	RESULT offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr);
+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:
+	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);
-public:
-	virtual ~eDVBServiceList();
-	RESULT getContent(std::list<eServiceReference> &list);
+	ePtr<iDVBChannelListQuery> m_query;
+	
+		/* for editing purposes. WARNING: lifetime issue! */
+	eBouquet *m_bouquet;
 };
 
-class eDVBServicePlay: public iPlayableService, public Object, public iServiceInformation
+class eDVBServicePlay: public iPlayableService, public iPauseableService, 
+		public iSeekableService, public Object, public iServiceInformation, 
+		public iAudioTrackSelection
 {
 DECLARE_REF(eDVBServicePlay);
+public:
+	virtual ~eDVBServicePlay();
+
+		// iPlayableService
+	RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection);
+	RESULT start();
+	RESULT stop();
+	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);
+
+		// 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);
+	eDVBServicePlay(const eServiceReference &ref, eDVBService *service);
 	
 	void gotNewEvent();
 	
 	void serviceEvent(int event);
 	Signal2<void,iPlayableService*,int> m_event;
-public:
-	virtual ~eDVBServicePlay();
-
-		// iPlayableService
-	RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection);
-	RESULT start();
-	RESULT stop();
-	RESULT pause(ePtr<iPauseableService> &ptr);
-	RESULT info(ePtr<iServiceInformation> &ptr);
 	
-		// iServiceInformation
-	RESULT getName(const eServiceReference &ref, std::string &name);
-	RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);
+	int m_is_pvr, m_is_paused;
 };
 
 #endif