X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=ServiceReference.py;h=11e287860991488d8c332faccee62dedace8caa3;hp=c4c2f467ef93ca9a6114e686708327a5aa35ce9a;hb=7ee1ed6595e67596385af85719a262d63dbcc93e;hpb=6e8738f7f86c2bd4263c99a0095dc1a071870dca

diff --git a/ServiceReference.py b/ServiceReference.py
index c4c2f46..11e2878 100644
--- a/ServiceReference.py
+++ b/ServiceReference.py
@@ -1,26 +1,22 @@
-
-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 getStaticServiceInformation(self):
-		info = iStaticServiceInformationPtr()
-		if NavigationInstance.instance.ServiceHandler.info(self.ref, info):
-			info = None
-		return info
-	
 	def __str__(self):
 		return self.ref.toString()
 	
 	def getServiceName(self):
-		info = self.getStaticServiceInformation()
-		if not info:
-			return None
-		
-		return info.getName(self.ref)
+		info = self.info()
+		return info and info.getName(self.ref) or ""
+
+	def info(self):
+		return self.serviceHandler.info(self.ref)
+
+	def list(self):
+		return self.serviceHandler.list(self.ref)