show used dvb system in tuner info dialog (dvb-s / dvb-s2)

[enigma2.git] / lib / python / Screens / ServiceInfo.py

diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index 747ee6f5579c324748165552a2bf27347f7af029..84eaec4bc2b1853b7d858cbf5f366c9b300afa33 100644 (file)
--- a/lib/python/Screens/ServiceInfo.py
+++ b/lib/python/Screens/ServiceInfo.py
@@ -68,8 +68,8 @@ class ServiceInfo(Screen):
                service = session.nav.getCurrentService()
                if service is not None:
                        self.info = service.info()
-                       self.feinfo = service.frontendStatusInfo()
-                       print self.info.getInfoObject(iServiceInformation.sVideoPID);
+                       self.feinfo = service.frontendInfo()
+                       print self.info.getInfoObject(iServiceInformation.sCAIDs);
                else:
                        self.info = None
 
@@ -106,21 +106,23 @@ class ServiceInfo(Screen):
                                   ("SID", self.getServiceInfoValue(iServiceInformation.sSID), TYPE_VALUE_HEX_DEC, 4))
                self.fillList(Labels)
        
-       def transponder(self):
-               frontendData = self.feinfo.getFrontendData(True)
+       def showFrontendData(self, real):
+               frontendData = self.feinfo and self.feinfo.getFrontendData(real)
                Labels = self.getFEData(frontendData)
                self.fillList(Labels)
+       
+       def transponder(self):
+               self.showFrontendData(True)
                
        def tuner(self):
-               frontendData = self.feinfo.getFrontendData(False)
-               Labels = self.getFEData(frontendData)
-               self.fillList(Labels)
+               self.showFrontendData(False)
                
        def getFEData(self, frontendData):
                if frontendData is None:
                        return []
                if frontendData["tuner_type"] == "DVB-S":
                        return ( ("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
+                                          ("System", frontendData["system"], TYPE_TEXT),
                                           ("Type", frontendData["tuner_type"], TYPE_TEXT),
                                           ("Orbital position", frontendData["orbital_position"], TYPE_VALUE_DEC),
                                           ("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
@@ -156,7 +158,6 @@ class ServiceInfo(Screen):
                tlist = [ ]
 
                for item in Labels:
-                       print item
                        value = item[1]
                        if len(item) < 4:
                                tlist.append(ServiceInfoListEntry(item[0]+":", value, item[2]))