X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/094b454c7e3b86cdcff697bb68cd367e53ba9e8e..70dfd18f5fc6f88b327ff5193b64ebff353c1458:/Navigation.py

diff --git a/Navigation.py b/Navigation.py
index 5fe26517..b71c93c5 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -11,8 +11,8 @@ class Navigation:
 			raise NavigationInstance.instance
 		
 		NavigationInstance.instance = self
-		self.ServiceHandler = eServiceCenterPtr()
-		eServiceCenter.getInstance(self.ServiceHandler)
+		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:
@@ -57,9 +58,11 @@ class Navigation:
 		return self.pnav.enqueueService(ref)
 	
 	def getCurrentService(self):
-		service = iPlayableServicePtr()
-		if self.pnav.getCurrentService(service):
+		service = self.pnav.getCurrentService()
+		
+		if service is None:
 			return None
+		
 		return service
 	
 	def getPlaylist(self):