Merge remote-tracking branch 'origin/bug_752_audio_selection_fix'

[enigma2.git] / ServiceReference.py

diff --git a/ServiceReference.py b/ServiceReference.py
index c4c2f467ef93ca9a6114e686708327a5aa35ce9a..4907fa280bcf221f9238c53633349e5377e2ff98 100644 (file)
--- a/ServiceReference.py
+++ b/ServiceReference.py
@@ -1,26 +1,35 @@
-
-from enigma import *
-
-import NavigationInstance
+from enigma import eServiceReference, eServiceCenter

 
 class ServiceReference(eServiceReference):
        def __init__(self, ref):
 
 class ServiceReference(eServiceReference):
        def __init__(self, ref):

-               if isinstance(ref, str):
-                       ref = eServiceReference(ref)
-               self.ref = ref
-
-       def getStaticServiceInformation(self):
-               info = iStaticServiceInformationPtr()
-               if NavigationInstance.instance.ServiceHandler.info(self.ref, info):
-                       info = None
-               return info
-       
+               if not isinstance(ref, eServiceReference):
+                       self.ref = eServiceReference(ref or "")
+               else:
+                       self.ref = ref
+               self.serviceHandler = eServiceCenter.getInstance()
+

        def __str__(self):
                return self.ref.toString()
        def __str__(self):
                return self.ref.toString()

-       
+

        def getServiceName(self):
        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)
+
+       def getType(self):
+               return self.ref.type
+
+       def getPath(self):
+               return self.ref.getPath()
+
+       def getFlags(self):
+               return self.ref.flags
+
+       def isRecordable(self):
+               ref = self.ref
+               return ref.flags & eServiceReference.isGroup or (ref.type == eServiceReference.idDVB and ref.getPath() == "")
\ No newline at end of file