consistently use iServiceHandler instead of eServiceCenter to use properly wrapped...

diff --git a/Navigation.py b/Navigation.py
index 03a1c618398c14c5b405847741ba35029415bffa..f1db8cb9ff8b934f08c016e5067e896aafefff85 100644 (file)
--- 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 6a849f89c2dda66cdfd6c56d0ac32291eae95bca..593af58e876fa55c6959ac46d8e7a2f8f86b2561 100644 (file)
--- 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 23ce9aad71cff41a281671448405e578256addc2..c9be96958b09a088a90fd199ba13edd00f91f233 100644 (file)
--- 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 f32e08658ea3c5604bbe7cfcc3d6acc2aac80a05..f560b62733fd4e2c3701b1bf879b1059faaf2c56 100644 (file)
--- 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 e08c2ada52370ba8ea596d476ef65b0ed56c8e48..f98d3e511a728845d4882c73bcc1487970ed69d3 100644 (file)
--- 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 64e62cacba817a452a8d4569dce0626cad4b6f94..ca08d481bd52c1b6c012aada84b1154bf1e7e3ea 100644 (file)
--- 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 5b5957eba1fd6066af3835623797e46a21aeefcd..057498d751de0191cb6a79426cbdaece4b55d451 100644 (file)
--- 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 b0e30f7a0a400e3c24ccdf3ea0936782641288b4..f7a9fddc0082bd2fa0eadcb93405e427ef87f3f8 100644 (file)
--- 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);
 }