X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d9ee52e4f0fbe9a1ae00d0e66f9e6f0a07fa319f..36f427fcb34bb0dafa3d395dbc6bfc060494c874:/lib/service/servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 94659ed1..f47c3906 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -1,14 +1,15 @@
-#ifndef __servicemp3_h
-#define __servicemp3_h
+#ifndef __servicedvb_h
+#define __servicedvb_h
 
 #include <lib/service/iservice.h>
 #include <lib/dvb/idvb.h>
 
 #include <lib/dvb/pmt.h>
+#include <lib/dvb/eit.h>
 
 class eServiceFactoryDVB: public iServiceHandler
 {
-DECLARE_REF;
+DECLARE_REF(eServiceFactoryDVB);
 public:
 	eServiceFactoryDVB();
 	virtual ~eServiceFactoryDVB();
@@ -19,34 +20,30 @@ 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
 {
-DECLARE_REF;
+DECLARE_REF(eDVBServiceList);
+public:
+	virtual ~eDVBServiceList();
+	RESULT getContent(std::list<eServiceReference> &list);
+	RESULT getNext(eServiceReference &ptr);
+	int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
 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;
 };
 
-class eDVBServicePlay: public iPlayableService, public Object, public iServiceInformation
+class eDVBServicePlay: public iPlayableService, public iPauseableService, public iSeekableService, public Object, public iServiceInformation
 {
-DECLARE_REF;
-private:
-	friend class eServiceFactoryDVB;
-	eServiceReference m_reference;
-	
-	ePtr<iTSMPEGDecoder> m_decoder;
-	
-	eDVBServicePMTHandler m_serviceHandler;
-	
-	eDVBServicePlay(const eServiceReference &ref);
-	
-	void serviceEvent(int event);
+DECLARE_REF(eDVBServicePlay);
 public:
 	virtual ~eDVBServicePlay();
 
@@ -54,11 +51,42 @@ public:
 	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);
 	
+		// iPauseableService
+	RESULT pause();
+	RESULT unpause();
+	
+		// iSeekableService
+	RESULT getLength(pts_t &len);
+	RESULT seekTo(pts_t to);
+	RESULT getPlayPosition(pts_t &pos);
+
 		// iServiceInformation
-	RESULT getName(const eServiceReference &ref, std::string &name);
+	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