some more SWIG_OUTPUT/SWIG_VOID API improvements

3 files changed, 6 insertions, 5 deletions

diff --git a/Navigation.py b/Navigation.py
index f1db8cb9..b71c93c5 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -11,8 +11,8 @@ class Navigation:
 			raise NavigationInstance.instance
 		
 		NavigationInstance.instance = self
-		self.ServiceHandler = eServiceCenterPtr()
 		self.ServiceHandler = eServiceCenter.getInstance()
+		print self.ServiceHandler
 
 		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
-		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:
diff --git a/ServiceReference.py b/ServiceReference.py
index 14ac5b29..25181863 100644
--- a/ServiceReference.py
+++ b/ServiceReference.py
@@ -17,7 +17,7 @@ class ServiceReference(eServiceReference):
 	
 	def getServiceName(self):
 		info = self.getStaticServiceInformation()
-		if info is not None:
+		if info is None:
 			return None
 		
 		return info.getName(self.ref)
diff --git a/lib/nav/pcore.h b/lib/nav/pcore.h
index d2e98b79..9e490844 100644
--- a/lib/nav/pcore.h
+++ b/lib/nav/pcore.h
@@ -24,7 +24,7 @@ public:
 	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);