follow itemHeight changes

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

diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index c05bd25e8b254473ba3422d9e0628c04dd8e95a1..83cdcd5f37baa078a707b7f09d777d517f2daaf2 100644 (file)
--- a/lib/python/Screens/ServiceInfo.py
+++ b/lib/python/Screens/ServiceInfo.py
@@ -43,12 +43,12 @@ class ServiceInfoList(HTMLComponent, GUIComponent):
                self.list = source
                self.l.setList(self.list)
                self.l.setFont(0, gFont("Regular", 23))
+               self.l.setItemHeight(25)
 
        GUI_WIDGET = eListbox
-       
+
        def postWidgetCreate(self, instance):
                self.instance.setContent(self.l)
-               self.instance.setItemHeight(25)
 
 TYPE_SERVICE_INFO = 1
 TYPE_TRANSPONDER_INFO = 2
@@ -75,6 +75,9 @@ class ServiceInfo(Screen):
                        self["blue"] = Label()
                        info = eServiceCenter.getInstance().info(serviceref)
                        self.transponder_info = info.getInfoObject(serviceref, iServiceInformation.sTransponderData)
+                       # info is a iStaticServiceInformation, not a iServiceInformation
+                       self.info = None
+                       self.feinfo = None
                else:
                        self.type = TYPE_SERVICE_INFO
                        self["red"] = Label(_("Serviceinfo"))
@@ -97,7 +100,7 @@ class ServiceInfo(Screen):
 
        def information(self):
                if self.type == TYPE_SERVICE_INFO:
-                       if self.session.nav.getCurrentlyPlayingServiceReference() is not None:
+                       if self.session.nav.getCurrentlyPlayingServiceReference():
                                name = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference()).getServiceName()
                        else:
                                name = "N/A"
@@ -106,11 +109,19 @@ class ServiceInfo(Screen):
                                aspect = "4:3"
                        else:
                                aspect = "16:9"
-                       Labels = ( ("Name", name, TYPE_TEXT),
-                                          ("Provider", self.getServiceInfoValue(iServiceInformation.sProvider), TYPE_TEXT),
-                                          ("Videoformat", aspect, TYPE_TEXT),
-                                          ("Videosize", "%dx%d" %(self.getServiceInfoValue(iServiceInformation.sVideoWidth), self.getServiceInfoValue(iServiceInformation.sVideoHeight)), TYPE_TEXT),
-                                          ("Namespace", self.getServiceInfoValue(iServiceInformation.sNamespace), TYPE_VALUE_HEX, 8))
+                       width = self.info and self.info.getInfo(iServiceInformation.sVideoWidth) or -1
+                       height = self.info and self.info.getInfo(iServiceInformation.sVideoHeight) or -1
+                       if width != -1 and height != -1:
+                               Labels = ( ("Name", name, TYPE_TEXT),
+                                                  ("Provider", self.getServiceInfoValue(iServiceInformation.sProvider), TYPE_TEXT),
+                                                  ("Videoformat", aspect, TYPE_TEXT),
+                                                  ("Videosize", "%dx%d" %(width, height), TYPE_TEXT),
+                                                  ("Namespace", self.getServiceInfoValue(iServiceInformation.sNamespace), TYPE_VALUE_HEX, 8))
+                       else:
+                               Labels = ( ("Name", name, TYPE_TEXT),
+                                                  ("Provider", self.getServiceInfoValue(iServiceInformation.sProvider), TYPE_TEXT),
+                                                  ("Videoformat", aspect, TYPE_TEXT),
+                                                  ("Namespace", self.getServiceInfoValue(iServiceInformation.sNamespace), TYPE_VALUE_HEX, 8))
                        self.fillList(Labels)
                else:
                        if self.transponder_info:
@@ -150,7 +161,7 @@ class ServiceInfo(Screen):
        
        def showFrontendData(self, real):
                if self.type == TYPE_SERVICE_INFO:
-                       frontendData = self.feinfo and self.feinfo.getFrontendData(real)
+                       frontendData = self.feinfo and self.feinfo.getAll(real)
                        Labels = self.getFEData(frontendData)
                        self.fillList(Labels)
        
@@ -163,42 +174,39 @@ class ServiceInfo(Screen):
                        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),
-                                          ("Type", frontendData["system"], TYPE_TEXT),
-                                          ("Modulation", frontendData["modulation"], TYPE_TEXT),
-                                          ("Orbital position", frontendData["orbital_position"], TYPE_VALUE_DEC),
-                                          ("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
-                                          ("Symbolrate", frontendData["symbol_rate"], TYPE_VALUE_DEC),
-                                          ("Polarization", frontendData["polarization"], TYPE_TEXT),
-                                          ("Inversion", frontendData["inversion"], TYPE_TEXT),
-                                          ("FEC inner", frontendData["fec_inner"], TYPE_TEXT),
-                                               )
-               elif frontendData["tuner_type"] == "DVB-C":
-                       return ( ("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
-                                          ("Type", frontendData["tuner_type"], TYPE_TEXT),
-                                          ("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
-                                          ("Symbolrate", frontendData["symbol_rate"], TYPE_VALUE_DEC),
-                                          ("Modulation", frontendData["modulation"], TYPE_TEXT),
-                                          ("Inversion", frontendData["inversion"], TYPE_TEXT),
-                                          ("FEC inner", frontendData["fec_inner"], TYPE_TEXT),
-                                               )
-               elif frontendData["tuner_type"] == "DVB-T":
-                       return ( ("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
-                                          ("Type", frontendData["tuner_type"], TYPE_TEXT),
-                                          ("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
-                                          ("Inversion", frontendData["inversion"], TYPE_TEXT),
-                                          ("Bandwidth", frontendData["bandwidth"], TYPE_VALUE_DEC),
-                                          ("CodeRateLP", frontendData["code_rate_lp"], TYPE_TEXT),
-                                          ("CodeRateHP", frontendData["code_rate_hp"], TYPE_TEXT),
-                                          ("Constellation", frontendData["constellation"], TYPE_TEXT),
-                                          ("Transmission Mode", frontendData["transmission_mode"], TYPE_TEXT),
-                                          ("Guard Interval", frontendData["guard_interval"], TYPE_TEXT),
-                                          ("Hierarchy Inform.", frontendData["hierarchy_information"], TYPE_TEXT),
-                                               )
-               
+               if frontendData and len(frontendData):
+                       if frontendData["tuner_type"] == "DVB-S":
+                               return (("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
+                                                       ("Type", frontendData["system"], TYPE_TEXT),
+                                                       ("Modulation", frontendData["modulation"], TYPE_TEXT),
+                                                       ("Orbital position", frontendData["orbital_position"], TYPE_VALUE_DEC),
+                                                       ("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
+                                                       ("Symbolrate", frontendData["symbol_rate"], TYPE_VALUE_DEC),
+                                                       ("Polarization", frontendData["polarization"], TYPE_TEXT),
+                                                       ("Inversion", frontendData["inversion"], TYPE_TEXT),
+                                                       ("FEC inner", frontendData["fec_inner"], TYPE_TEXT))
+                       elif frontendData["tuner_type"] == "DVB-C":
+                               return (("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
+                                               ("Type", frontendData["tuner_type"], TYPE_TEXT),
+                                               ("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
+                                               ("Symbolrate", frontendData["symbol_rate"], TYPE_VALUE_DEC),
+                                               ("Modulation", frontendData["modulation"], TYPE_TEXT),
+                                               ("Inversion", frontendData["inversion"], TYPE_TEXT),
+                                               ("FEC inner", frontendData["fec_inner"], TYPE_TEXT))
+                       elif frontendData["tuner_type"] == "DVB-T":
+                               return (("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
+                                               ("Type", frontendData["tuner_type"], TYPE_TEXT),
+                                               ("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
+                                               ("Inversion", frontendData["inversion"], TYPE_TEXT),
+                                               ("Bandwidth", frontendData["bandwidth"], TYPE_VALUE_DEC),
+                                               ("CodeRateLP", frontendData["code_rate_lp"], TYPE_TEXT),
+                                               ("CodeRateHP", frontendData["code_rate_hp"], TYPE_TEXT),
+                                               ("Constellation", frontendData["constellation"], TYPE_TEXT),
+                                               ("Transmission Mode", frontendData["transmission_mode"], TYPE_TEXT),
+                                               ("Guard Interval", frontendData["guard_interval"], TYPE_TEXT),
+                                               ("Hierarchy Inform.", frontendData["hierarchy_information"], TYPE_TEXT))
+               return [ ]
+
        def fillList(self, Labels):
                tlist = [ ]