From fc233e3a96e68514165781859afc94a2bb33e9e9 Mon Sep 17 00:00:00 2001
From: Felix Domke <tmbinc@elitedvb.net>
Date: Thu, 29 Sep 2005 23:06:02 +0000
Subject: [PATCH] consistently use iServiceHandler instead of eServiceCenter to
 use properly wrapped interface

---
 Navigation.py                | 2 +-
 lib/nav/pcore.cpp            | 2 +-
 lib/python/swig.h            | 2 ++
 lib/service/listboxservice.h | 3 +--
 lib/service/service.h        | 3 ++-
 lib/service/servicedvb.cpp   | 4 ++--
 lib/service/servicefs.cpp    | 4 ++--
 lib/service/servicemp3.cpp   | 4 ++--
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Navigation.py b/Navigation.py
index 03a1c61..f1db8cb 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -12,7 +12,7 @@ class Navigation:
 		
 		NavigationInstance.instance = self
 		self.ServiceHandler = eServiceCenterPtr()
-		eServiceCenter.getInstance(self.ServiceHandler)
+		self.ServiceHandler = eServiceCenter.getInstance()
 
 		import Navigation as Nav
 		Nav.navcore = self
diff --git a/lib/nav/pcore.cpp b/lib/nav/pcore.cpp
index 6a849f8..593af58 100644
--- a/lib/nav/pcore.cpp
+++ b/lib/nav/pcore.cpp
@@ -7,7 +7,7 @@ DEFINE_REF(pNavigation);
 
 pNavigation::pNavigation()
 {
-	ePtr<eServiceCenter> service_center;
+	ePtr<iServiceHandler> service_center;
 	eServiceCenter::getInstance(service_center);
 
 	assert(service_center);
diff --git a/lib/python/swig.h b/lib/python/swig.h
index 23ce9aa..c9be969 100644
--- a/lib/python/swig.h
+++ b/lib/python/swig.h
@@ -16,10 +16,12 @@ typedef x y; \
 #ifdef SWIG
 #define SWIG_INPUT INPUT
 #define SWIG_OUTPUT OUTPUT
+#define SWIG_NAMED_OUTPUT(x) OUTPUT
 #define SWIG_VOID(x) void
 #else
 #define SWIG_INPUT
 #define SWIG_OUTPUT
+#define SWIG_NAMED_OUTPUT(x) x
 #define SWIG_VOID(x) x
 #endif
 
diff --git a/lib/service/listboxservice.h b/lib/service/listboxservice.h
index f32e086..f560b62 100644
--- a/lib/service/listboxservice.h
+++ b/lib/service/listboxservice.h
@@ -5,7 +5,6 @@
 #include <lib/service/iservice.h>
 
 #include <set>
-class eServiceCenter;
 
 class eListboxServiceContent: public virtual iListboxContent
 {
@@ -78,7 +77,7 @@ private:
 	int m_size;
 	
 	eSize m_itemsize;
-	ePtr<eServiceCenter> m_service_center;
+	ePtr<iServiceHandler> m_service_center;
 	
 	eServiceReference m_root;
 	
diff --git a/lib/service/service.h b/lib/service/service.h
index e08c2ad..f98d3e5 100644
--- a/lib/service/service.h
+++ b/lib/service/service.h
@@ -27,7 +27,8 @@ public:
 	RESULT offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr);
 	
 		// eServiceCenter
-	static RESULT getInstance(eServiceCenterPtr &ptr) { ptr = instance; return 0; }
+	static RESULT getPrivInstance(eServiceCenterPtr &ptr) { ptr = instance; return 0; }
+	static RESULT getInstance(iServiceHandlerPtr &SWIG_NAMED_OUTPUT(ptr)) { ptr = instance; return 0; }
 	RESULT addServiceFactory(int id, iServiceHandler *hnd);
 	RESULT removeServiceFactory(int id);
 };
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 64e62ca..ca08d48 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -109,7 +109,7 @@ eServiceFactoryDVB::eServiceFactoryDVB()
 {
 	ePtr<eServiceCenter> sc;
 	
-	eServiceCenter::getInstance(sc);
+	eServiceCenter::getPrivInstance(sc);
 	if (sc)
 		sc->addServiceFactory(eServiceFactoryDVB::id, this);
 }
@@ -118,7 +118,7 @@ eServiceFactoryDVB::~eServiceFactoryDVB()
 {
 	ePtr<eServiceCenter> sc;
 	
-	eServiceCenter::getInstance(sc);
+	eServiceCenter::getPrivInstance(sc);
 	if (sc)
 		sc->removeServiceFactory(eServiceFactoryDVB::id);
 }
diff --git a/lib/service/servicefs.cpp b/lib/service/servicefs.cpp
index 5b5957e..057498d 100644
--- a/lib/service/servicefs.cpp
+++ b/lib/service/servicefs.cpp
@@ -33,7 +33,7 @@ eServiceFactoryFS::eServiceFactoryFS()
 {
 	ePtr<eServiceCenter> sc;
 	
-	eServiceCenter::getInstance(sc);
+	eServiceCenter::getPrivInstance(sc);
 	if (sc)
 		sc->addServiceFactory(eServiceFactoryFS::id, this);
 	
@@ -44,7 +44,7 @@ eServiceFactoryFS::~eServiceFactoryFS()
 {
 	ePtr<eServiceCenter> sc;
 	
-	eServiceCenter::getInstance(sc);
+	eServiceCenter::getPrivInstance(sc);
 	if (sc)
 		sc->removeServiceFactory(eServiceFactoryFS::id);
 }
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index b0e30f7..f7a9fdd 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -13,7 +13,7 @@ eServiceFactoryMP3::eServiceFactoryMP3()
 {
 	ePtr<eServiceCenter> sc;
 	
-	eServiceCenter::getInstance(sc);
+	eServiceCenter::getPrivInstance(sc);
 	if (sc)
 		sc->addServiceFactory(eServiceFactoryMP3::id, this);
 
@@ -24,7 +24,7 @@ eServiceFactoryMP3::~eServiceFactoryMP3()
 {
 	ePtr<eServiceCenter> sc;
 	
-	eServiceCenter::getInstance(sc);
+	eServiceCenter::getPrivInstance(sc);
 	if (sc)
 		sc->removeServiceFactory(eServiceFactoryMP3::id);
 }
-- 
2.7.4