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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 94659ed1..5dd2f3b2 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();
@@ -23,7 +24,7 @@ public:
 
 class eDVBServiceList: public iListableService
 {
-DECLARE_REF;
+DECLARE_REF(eDVBServiceList);
 private:
 	eServiceReference m_parent;
 	friend class eServiceFactoryDVB;
@@ -35,18 +36,22 @@ public:
 
 class eDVBServicePlay: public iPlayableService, public Object, public iServiceInformation
 {
-DECLARE_REF;
+DECLARE_REF(eDVBServicePlay);
 private:
 	friend class eServiceFactoryDVB;
 	eServiceReference m_reference;
 	
 	ePtr<iTSMPEGDecoder> m_decoder;
 	
-	eDVBServicePMTHandler m_serviceHandler;
+	eDVBServicePMTHandler m_service_handler;
+	eDVBServiceEITHandler m_event_handler;
 	
 	eDVBServicePlay(const eServiceReference &ref);
 	
+	void gotNewEvent();
+	
 	void serviceEvent(int event);
+	Signal2<void,iPlayableService*,int> m_event;
 public:
 	virtual ~eDVBServicePlay();
 
@@ -59,6 +64,7 @@ public:
 	
 		// iServiceInformation
 	RESULT getName(const eServiceReference &ref, std::string &name);
+	RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);
 };
 
 #endif