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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 94659ed1..5c750430 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,11 +20,13 @@ public:
 	RESULT record(const eServiceReference &, ePtr<iRecordableService> &ptr);
 	RESULT list(const eServiceReference &, ePtr<iListableService> &ptr);
 	RESULT info(const eServiceReference &, ePtr<iStaticServiceInformation> &ptr);
+private:
+	RESULT lookupService(ePtr<eDVBService> &ptr, const eServiceReference &ref);
 };
 
 class eDVBServiceList: public iListableService
 {
-DECLARE_REF;
+DECLARE_REF(eDVBServiceList);
 private:
 	eServiceReference m_parent;
 	friend class eServiceFactoryDVB;
@@ -31,22 +34,29 @@ private:
 public:
 	virtual ~eDVBServiceList();
 	RESULT getContent(std::list<eServiceReference> &list);
+	RESULT getNext(eServiceReference &ptr);
 };
 
 class eDVBServicePlay: public iPlayableService, public Object, public iServiceInformation
 {
-DECLARE_REF;
+DECLARE_REF(eDVBServicePlay);
 private:
 	friend class eServiceFactoryDVB;
 	eServiceReference m_reference;
 	
+	ePtr<eDVBService> m_dvb_service;
+	
 	ePtr<iTSMPEGDecoder> m_decoder;
 	
-	eDVBServicePMTHandler m_serviceHandler;
+	eDVBServicePMTHandler m_service_handler;
+	eDVBServiceEITHandler m_event_handler;
+	
+	eDVBServicePlay(const eServiceReference &ref, eDVBService *service);
 	
-	eDVBServicePlay(const eServiceReference &ref);
+	void gotNewEvent();
 	
 	void serviceEvent(int event);
+	Signal2<void,iPlayableService*,int> m_event;
 public:
 	virtual ~eDVBServicePlay();
 
@@ -58,7 +68,8 @@ public:
 	RESULT info(ePtr<iServiceInformation> &ptr);
 	
 		// iServiceInformation
-	RESULT getName(const eServiceReference &ref, std::string &name);
+	RESULT getName(std::string &name);
+	RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);
 };
 
 #endif