X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e677ac4a7bf81391877c909a703e5918ce4a511b..5561f5ec4f0a55d9256c3eab0ce121ae82ee5c90:/lib/service/iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index f699bdb9..4592a971 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -6,14 +6,6 @@
 #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:
@@ -151,15 +143,21 @@ class iStaticServiceInformation: public iObject
 {
 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);
 
 class eServiceEvent;
 
-class iServiceInformation: public iStaticServiceInformation
+class iServiceInformation: public iObject
 {
 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);
 };
 
@@ -184,7 +182,7 @@ public:
 		evEnd,
 		
 		// when iServiceInformation is implemented:
-		evNewEvent
+		evUpdatedEventInfo
 	};
 	virtual RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)=0;
 	virtual RESULT start()=0;
@@ -198,6 +196,7 @@ TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
 class iRecordableService: public iObject
 {
 public:
+	virtual RESULT prepare()=0;
 	virtual RESULT start()=0;
 	virtual RESULT stop()=0;
 };