X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d63d2c3c6cbbd574dda4f8b00ebe6c661735edd5..a19aef8b3244f753b02e5a06e7d3a185a424949f:/lib/service/service.h

diff --git a/lib/service/service.h b/lib/service/service.h
index f32e23d9..813da24c 100644
--- a/lib/service/service.h
+++ b/lib/service/service.h
@@ -5,23 +5,35 @@
 #include <lib/base/object.h>
 #include <lib/service/iservice.h>
 
-class eServiceCenter: public virtual iServiceHandler, public virtual iObject
+class eServiceCenter;
+
+typedef ePtr<eServiceCenter> eServiceCenterPtr;
+
+class eServiceCenter: public iServiceHandler
 {
-DECLARE_REF;
+DECLARE_REF(eServiceCenter);
 private:
-	std::map<int,ePtr<iServiceHandler> > handler;
+	std::map<int,iServiceHandlerPtr> handler;
 	static eServiceCenter *instance;
+#ifdef SWIG
+	eServiceCenter();
+	~eServiceCenter();
+#endif
 public:
+#ifndef SWIG
 	eServiceCenter();
 	virtual ~eServiceCenter();
-
+#endif
 		// iServiceHandler
-	RESULT play(const eServiceReference &, ePtr<iPlayableService> &ptr);
-	RESULT record(const eServiceReference &, ePtr<iRecordableService> &ptr);
-	RESULT list(const eServiceReference &, ePtr<iListableService> &ptr);
+	RESULT play(const eServiceReference &, iPlayableServicePtr &ptr);
+	RESULT record(const eServiceReference &, iRecordableServicePtr &ptr);
+	RESULT list(const eServiceReference &, iListableServicePtr &ptr);
+	RESULT info(const eServiceReference &, ePtr<iStaticServiceInformation> &ptr);
+	RESULT offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr);
 	
 		// eServiceCenter
-	static RESULT getInstance(ePtr<eServiceCenter> &ptr) { ptr = instance; return 0; }
+	static RESULT getPrivInstance(eServiceCenterPtr &ptr) { ptr = instance; return 0; }
+	static SWIG_VOID(RESULT) getInstance(iServiceHandlerPtr &SWIG_NAMED_OUTPUT(ptr)) { ptr = instance; return 0; }
 	RESULT addServiceFactory(int id, iServiceHandler *hnd);
 	RESULT removeServiceFactory(int id);
 };