git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- skins are now loaded first and applied later
[enigma2.git]
/
lib
/
service
/
iservice.h
diff --git
a/lib/service/iservice.h
b/lib/service/iservice.h
index 5a8a0627fa1ba913e142a4338f73aebfcb2324ff..4592a971dff60faf7505b37412b7e717655cd683 100644
(file)
--- a/
lib/service/iservice.h
+++ b/
lib/service/iservice.h
@@
-6,14
+6,6
@@
#include <connection.h>
#include <list>
#include <connection.h>
#include <list>
-#ifdef SWIG
-#define TEMPLATE_TYPEDEF(x, y) \
-%template(y) x; \
-typedef x y
-#else
-#define TEMPLATE_TYPEDEF(x, y) typedef x y
-#endif
-
class eServiceReference
{
public:
class eServiceReference
{
public:
@@
-151,14
+143,22
@@
class iStaticServiceInformation: public iObject
{
public:
virtual RESULT getName(const eServiceReference &ref, std::string &name)=0;
{
public:
virtual RESULT getName(const eServiceReference &ref, std::string &name)=0;
+
+ // FOR SWIG
+ std::string getName(const eServiceReference &ref) { std::string temp; getName(ref, temp); return temp; }
};
TEMPLATE_TYPEDEF(ePtr<iStaticServiceInformation>, iStaticServiceInformationPtr);
};
TEMPLATE_TYPEDEF(ePtr<iStaticServiceInformation>, iStaticServiceInformationPtr);
-class iServiceInformation: public iStaticServiceInformation
+class eServiceEvent;
+
+class iServiceInformation: public iObject
{
public:
{
public:
-
+ virtual RESULT getName(std::string &name)=0;
+ // FOR SWIG
+ std::string getName() { std::string temp; getName(temp); return temp; }
+ virtual RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);
};
TEMPLATE_TYPEDEF(ePtr<iServiceInformation>, iServiceInformationPtr);
};
TEMPLATE_TYPEDEF(ePtr<iServiceInformation>, iServiceInformationPtr);
@@
-179,7
+179,10
@@
public:
enum
{
evStart,
enum
{
evStart,
- evEnd
+ evEnd,
+
+ // when iServiceInformation is implemented:
+ evUpdatedEventInfo
};
virtual RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)=0;
virtual RESULT start()=0;
};
virtual RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)=0;
virtual RESULT start()=0;
@@
-193,6
+196,7
@@
TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
class iRecordableService: public iObject
{
public:
class iRecordableService: public iObject
{
public:
+ virtual RESULT prepare()=0;
virtual RESULT start()=0;
virtual RESULT stop()=0;
};
virtual RESULT start()=0;
virtual RESULT stop()=0;
};