X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5cb2d3d4e46a40693cee0173425f8bc2ade2f09b..94917f32471fd6fa65d9c014107b849f58bcdd09:/lib/python/Screens/ServiceInfo.py diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py index fa948150..4606f883 100644 --- 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 @@ -15,6 +14,9 @@ TYPE_VALUE_DEC = 2 TYPE_VALUE_HEX_DEC = 3 TYPE_SLIDER = 4 +def to_unsigned(x): + return x & 0xFFFFFFFF + def ServiceInfoListEntry(a, b, valueType=TYPE_TEXT, param=4): res = [ ] @@ -24,11 +26,11 @@ def ServiceInfoListEntry(a, b, valueType=TYPE_TEXT, param=4): print "b:", b if type(b) is not str: if valueType == TYPE_VALUE_HEX: - b = ("0x%0" + str(param) + "x") % b + b = ("0x%0" + str(param) + "x") % to_unsigned(b) elif valueType == TYPE_VALUE_DEC: b = str(b) elif valueType == TYPE_VALUE_HEX_DEC: - b = ("0x%0" + str(param) + "x (%dd)") % (b, b) + b = ("0x%0" + str(param) + "x (%dd)") % (to_unsigned(b), b) else: b = str(b) @@ -43,12 +45,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 @@ -102,8 +104,10 @@ class ServiceInfo(Screen): if self.type == TYPE_SERVICE_INFO: if self.session.nav.getCurrentlyPlayingServiceReference(): name = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference()).getServiceName() + refstr = self.session.nav.getCurrentlyPlayingServiceReference().toString() else: name = "N/A" + refstr = "N/A" aspect = self.getServiceInfoValue(iServiceInformation.sAspect) if aspect in ( 1, 2, 5, 6, 9, 0xA, 0xD, 0xE ): aspect = "4:3" @@ -116,26 +120,29 @@ class ServiceInfo(Screen): ("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)) + ("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)) + ("Namespace", self.getServiceInfoValue(iServiceInformation.sNamespace), TYPE_VALUE_HEX, 8), + ("Service Reference", refstr, TYPE_TEXT)) self.fillList(Labels) else: if self.transponder_info: conv = { "type" : _("Transponder Type"), + "system" : _("System"), + "modulation" : _("Modulation"), + "orbital position" : _("Orbital Position"), "frequency" : _("Frequency"), "symbolrate" : _("Symbolrate"), - "orbital position" : _("Orbital Position"), - "inversion" : _("Inversion"), - "fec inner" : _("FEC"), - "modulation" : _("Modulation"), + "bandwidth" : _("Bandwidth"), "polarization" : _("Polarization"), + "inversion" : _("Inversion"), + "pilot" : _("Pilot"), "roll off" : _("Rolloff"), - "system" : _("System"), - "bandwidth" : _("Bandwidth"), + "fec inner" : _("FEC"), "code rate lp" : _("Coderate LP"), "code rate hp" : _("Coderate HP"), "constellation" : _("Constellation"), @@ -161,7 +168,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) @@ -174,46 +181,47 @@ 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), + ("Pilot", frontendData.get("pilot", None), TYPE_TEXT), + ("Rolloff", frontendData.get("rolloff", None), 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 = [ ] for item in Labels: + if item[1] is None: + continue; value = item[1] if len(item) < 4: tlist.append(ServiceInfoListEntry(item[0]+":", value, item[2]))