Revert "[DVDBurn] usability improvements: title list layout, bottom info area, consis...

[enigma2.git] / ServiceReference.py

diff --git a/ServiceReference.py b/ServiceReference.py
index 150708d105ef560289be01c84b4a8e3722f90e4d..11e287860991488d8c332faccee62dedace8caa3 100644 (file)
--- 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)