git.cweiske.de / enigma2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix coverart png stuff
[enigma2.git] / lib / python / Screens / ServiceInfo.py
diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index 540369092bf6e2f8aaa3f04fb857ac544d181948..7bd8aa9821dbae3e1cfe1694c3011aee1ad2ee0a 100644 (file)
--- a/lib/python/Screens/ServiceInfo.py
+++ b/lib/python/Screens/ServiceInfo.py
@@ -1,9 +1,8 @@
-from Components.HTMLComponent import *
-from Components.GUIComponent import *
+from Components.HTMLComponent import HTMLComponent
+from Components.GUIComponent import GUIComponent
 from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.Label import Label
-from Components.MenuList import MenuList
 from ServiceReference import ServiceReference
 from enigma import eListboxPythonMultiContent, eListbox, gFont, iServiceInformation, eServiceCenter
 
@@ -30,8 +29,7 @@ def ServiceInfoListEntry(a, b, valueType=TYPE_TEXT, param=4):
                elif valueType == TYPE_VALUE_HEX_DEC:
                        b = ("0x%0" + str(param) + "x (%dd)") % (b, b)
                else:
-                       b = str(b)              
-       
+                       b = str(b)
        
        res.append((eListboxPythonMultiContent.TYPE_TEXT, 220, 0, 350, 25, 0, RT_HALIGN_LEFT, b))
 
@@ -44,12 +42,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
@@ -76,6 +74,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"))
@@ -98,14 +99,32 @@ 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()
+                               refstr = self.session.nav.getCurrentlyPlayingServiceReference().toString()
                        else:
                                name = "N/A"
-                       Labels = ( ("Name",  name, TYPE_TEXT),
-                                          ("Provider", self.getServiceInfoValue(iServiceInformation.sProvider), TYPE_TEXT),
-                                          ("Videoformat", self.getServiceInfoValue(iServiceInformation.sAspect), TYPE_TEXT),
-                                          ("Namespace", self.getServiceInfoValue(iServiceInformation.sNamespace), TYPE_VALUE_HEX, 8))
+                               refstr = "N/A"
+                       aspect = self.getServiceInfoValue(iServiceInformation.sAspect)
+                       if aspect in ( 1, 2, 5, 6, 9, 0xA, 0xD, 0xE ):
+                               aspect = "4:3"
+                       else:
+                               aspect = "16:9"
+                       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),
+                                                  ("Service Reference", refstr, TYPE_TEXT))
+                       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),
+                                                  ("Service Reference", refstr, TYPE_TEXT))
                        self.fillList(Labels)
                else:
                        if self.transponder_info:
@@ -145,7 +164,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)
        
@@ -158,42 +177,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 = [ ]
 
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources