X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fservice.h;h=77173c53a60a48b3c4610962da19fdaa8a90ef8a;hp=f98d3e511a728845d4882c73bcc1487970ed69d3;hb=ed40f6f85c9c07c3c1224ae20601082c0309a631;hpb=fc233e3a96e68514165781859afc94a2bb33e9e9

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