X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=ServiceReference.py;h=11e287860991488d8c332faccee62dedace8caa3;hp=150708d105ef560289be01c84b4a8e3722f90e4d;hb=b7f07b6052ac2ca6b5e2a2c9e322b26e2c506109;hpb=b61a19dfbaeb8d614f8004a3e9af79737a850abc

diff --git a/ServiceReference.py b/ServiceReference.py
index 150708d..11e2878 100644
--- a/ServiceReference.py
+++ b/ServiceReference.py
@@ -1,13 +1,11 @@
-
-from enigma import *
-
-import NavigationInstance
+from enigma import eServiceReference, eServiceCenter
 
 class ServiceReference(eServiceReference):
 	def __init__(self, ref):
-		if isinstance(ref, str):
-			ref = eServiceReference(ref)
-		self.ref = ref
+		if not isinstance(ref, eServiceReference):
+			self.ref = eServiceReference(ref or "")
+		else:
+			self.ref = ref
 		self.serviceHandler = eServiceCenter.getInstance()
 
 	def __str__(self):
@@ -15,22 +13,10 @@ class ServiceReference(eServiceReference):
 	
 	def getServiceName(self):
 		info = self.info()
-		if info is None:
-			return None
-		
-		return info.getName(self.ref)
+		return info and info.getName(self.ref) or ""
 
-	def play(self):
-		return self.serviceHandler.info(self.ref)
-	
-	def record(self):
-		return self.serviceHandler.record(self.ref)
-	
-	def list(self):
-		return self.serviceHandler.list(self)
-	
 	def info(self):
-		return self.serviceHandler.info(self)
+		return self.serviceHandler.info(self.ref)
 
-	def offlineOperations(self):
-		return self.serviceHandler.offlineOperations(self.ref)
+	def list(self):
+		return self.serviceHandler.list(self.ref)