X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/32e4324b9b5e615a84885b9132505e4706ededfe..8f01a41693ff4b01a224e9ea2f9a26538ec20414:/lib/service/servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 57dca9a0..ac856ed7 100644
--- 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,26 @@ 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
 {
 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();
 
@@ -74,14 +66,39 @@ public:
 	RESULT pause(ePtr<iPauseableService> &ptr);
 	RESULT info(ePtr<iServiceInformation> &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);
+
+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;
 };
 
 #endif