git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- add missing file
[enigma2.git]
/
lib
/
service
/
servicedvb.h
diff --git
a/lib/service/servicedvb.h
b/lib/service/servicedvb.h
index 94659ed1106a88aa666f8f3618ffdfb638d8e836..5dd2f3b289bb918b281748d5ceded8825160f72f 100644
(file)
--- a/
lib/service/servicedvb.h
+++ b/
lib/service/servicedvb.h
@@
-1,14
+1,15
@@
-#ifndef __service
mp3
_h
-#define __service
mp3
_h
+#ifndef __service
dvb
_h
+#define __service
dvb
_h
#include <lib/service/iservice.h>
#include <lib/dvb/idvb.h>
#include <lib/dvb/pmt.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
{
class eServiceFactoryDVB: public iServiceHandler
{
-DECLARE_REF;
+DECLARE_REF
(eServiceFactoryDVB)
;
public:
eServiceFactoryDVB();
virtual ~eServiceFactoryDVB();
public:
eServiceFactoryDVB();
virtual ~eServiceFactoryDVB();
@@
-23,7
+24,7
@@
public:
class eDVBServiceList: public iListableService
{
class eDVBServiceList: public iListableService
{
-DECLARE_REF;
+DECLARE_REF
(eDVBServiceList)
;
private:
eServiceReference m_parent;
friend class eServiceFactoryDVB;
private:
eServiceReference m_parent;
friend class eServiceFactoryDVB;
@@
-35,18
+36,22
@@
public:
class eDVBServicePlay: public iPlayableService, public Object, public iServiceInformation
{
class eDVBServicePlay: public iPlayableService, public Object, public iServiceInformation
{
-DECLARE_REF;
+DECLARE_REF
(eDVBServicePlay)
;
private:
friend class eServiceFactoryDVB;
eServiceReference m_reference;
ePtr<iTSMPEGDecoder> m_decoder;
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);
eDVBServicePlay(const eServiceReference &ref);
+ void gotNewEvent();
+
void serviceEvent(int event);
void serviceEvent(int event);
+ Signal2<void,iPlayableService*,int> m_event;
public:
virtual ~eDVBServicePlay();
public:
virtual ~eDVBServicePlay();
@@
-59,6
+64,7
@@
public:
// iServiceInformation
RESULT getName(const eServiceReference &ref, std::string &name);
// iServiceInformation
RESULT getName(const eServiceReference &ref, std::string &name);
+ RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);
};
#endif
};
#endif