- simplified getInterface-styled calls: now using return value instead of mutable argument

3 files changed, 11 insertions, 7 deletions

diff --git a/lib/python/Components/EventInfo.py b/lib/python/Components/EventInfo.py
index 656fd279..ac7ed9b5 100644
--- a/lib/python/Components/EventInfo.py
+++ b/lib/python/Components/EventInfo.py
@@ -23,7 +23,8 @@ class EventInfo(PerServiceDisplay):
 		service = self.navcore.getCurrentService()
 		
 		if service != None:
-			if not service.info(info):
+			info = service.info()
+			if info is not None: 
 				ev = eServiceEventPtr()
 				if info.getEvent(ev, self.now_or_next & 1) == 0:
 					if self.now_or_next & 2:
diff --git a/lib/python/Components/ServiceName.py b/lib/python/Components/ServiceName.py
index 5352de5d..c6dcbb7a 100644
--- a/lib/python/Components/ServiceName.py
+++ b/lib/python/Components/ServiceName.py
@@ -12,11 +12,13 @@ class ServiceName(PerServiceDisplay):
 			})
 
 	def newService(self):
-		info = iServiceInformationPtr()
 		service = self.navcore.getCurrentService()
 		
-		if service != None:
-			if not service.info(info):
+		print service
+		
+		if service is not None:
+			info = service.info()
+			if info is not None:
 				self.setText(info.getName())
 				setLCD(info.getName())
 	
diff --git a/lib/python/Components/ServicePosition.py b/lib/python/Components/ServicePosition.py
index 462102f8..e402751c 100644
--- a/lib/python/Components/ServicePosition.py
+++ b/lib/python/Components/ServicePosition.py
@@ -33,7 +33,8 @@ class ServicePosition(PerServiceDisplay):
 		self.available = 0
 		
 		if service != None:
-			if not service.seek(seek):
+			seek = service.seek(seek)
+			if seek != None:
 				if self.type != self.TYPE_LENGTH:
 					self.updateTimer.start(500)
 				
@@ -43,11 +44,11 @@ class ServicePosition(PerServiceDisplay):
 		self.update()
 	
 	def get(self, what):
-		seek = iSeekableServicePtr()
 		service = self.navcore.getCurrentService()
 		
 		if service != None:
-			if not service.seek(seek):
+			seek = service.seek(seek)
+			if seek != None:
 				if what == self.TYPE_LENGTH:
 					r = seek.getLength()
 				elif what == self.TYPE_POSITION: