some more SWIG_OUTPUT/SWIG_VOID API improvements

diff --git a/Navigation.py b/Navigation.py
index f1db8cb9ff8b934f08c016e5067e896aafefff85..b71c93c54d75f711bfcece39f60c67aabf201f85 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -11,8 +11,8 @@ class Navigation:
                        raise NavigationInstance.instance
                
                NavigationInstance.instance = self
                        raise NavigationInstance.instance
                
                NavigationInstance.instance = self

-               self.ServiceHandler = eServiceCenterPtr()

                self.ServiceHandler = eServiceCenter.getInstance()
                self.ServiceHandler = eServiceCenter.getInstance()

+               print self.ServiceHandler

 
                import Navigation as Nav
                Nav.navcore = self
 
                import Navigation as Nav
                Nav.navcore = self


@@ -45,8 +45,9 @@ class Navigation:
                print "recording service: %s" % (str(ref))
                if isinstance(ref, ServiceReference.ServiceReference):
                        ref = ref.ref
                print "recording service: %s" % (str(ref))
                if isinstance(ref, ServiceReference.ServiceReference):
                        ref = ref.ref

-               service = iRecordableServicePtr()
-               if self.pnav.recordService(ref, service):
+               service = self.pnav.recordService(ref)
+               
+               if service is None:

                        print "record returned non-zero"
                        return None
                else:
                        print "record returned non-zero"
                        return None
                else:

diff --git a/ServiceReference.py b/ServiceReference.py
index 14ac5b29d75f3b3edd2ea9d35557a21366d0bbed..25181863c1307b638f18620aad99a75b226fc165 100644 (file)
--- a/ServiceReference.py
+++ b/ServiceReference.py
@@ -17,7 +17,7 @@ class ServiceReference(eServiceReference):
        
        def getServiceName(self):
                info = self.getStaticServiceInformation()
        
        def getServiceName(self):
                info = self.getStaticServiceInformation()

-               if info is not None:
+               if info is None:

                        return None
                
                return info.getName(self.ref)
                        return None
                
                return info.getName(self.ref)

diff --git a/lib/nav/pcore.h b/lib/nav/pcore.h
index d2e98b79d9ca906b9efa691c1653d57bcb480f9d..9e490844e43398282d619c52a21cb8478601f462 100644 (file)
--- a/lib/nav/pcore.h
+++ b/lib/nav/pcore.h
@@ -24,7 +24,7 @@ public:
        pNavigation();
        
        RESULT playService(const eServiceReference &service);
        pNavigation();
        
        RESULT playService(const eServiceReference &service);

-       RESULT recordService(const eServiceReference &ref, ePtr<iRecordableService> &service);
+       SWIG_VOID(RESULT) recordService(const eServiceReference &ref, ePtr<iRecordableService> &SWIG_OUTPUT);

        
        RESULT enqueueService(const eServiceReference &service);
        SWIG_VOID(RESULT) getCurrentService(ePtr<iPlayableService> &SWIG_OUTPUT);
        
        RESULT enqueueService(const eServiceReference &service);
        SWIG_VOID(RESULT) getCurrentService(ePtr<iPlayableService> &SWIG_OUTPUT);