X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FServiceInfo.py;h=6e7b58e7eb54119a44918066d5dc6d1b025cd4b0;hp=b063a8a78fe59207f88666264518babc89eed602;hb=faaf85f037e9d29dd9f5178016caf7c80776d55b;hpb=d812a4bbfa77b845fe9cfe7d5d1124d302c155e1 diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py index b063a8a..6e7b58e 100644 --- a/lib/python/Screens/ServiceInfo.py +++ b/lib/python/Screens/ServiceInfo.py @@ -1,11 +1,13 @@ -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 +from enigma import eListboxPythonMultiContent, eListbox, gFont, iServiceInformation, eServiceCenter +from Tools.Transponder import ConvertToHumanReadable +from Components.NimManager import nimmanager +import skin RT_HALIGN_LEFT = 0 @@ -15,27 +17,30 @@ TYPE_VALUE_DEC = 2 TYPE_VALUE_HEX_DEC = 3 TYPE_SLIDER = 4 -def ServiceInfoListEntry(a, b, valueType=TYPE_TEXT, param=4): - res = [ ] +def to_unsigned(x): + return x & 0xFFFFFFFF - #PyObject *type, *px, *py, *pwidth, *pheight, *pfnt, *pstring, *pflags; - res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 200, 30, 0, RT_HALIGN_LEFT, "")) - res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 150, 25, 0, RT_HALIGN_LEFT, a)) +def ServiceInfoListEntry(a, b, valueType=TYPE_TEXT, param=4): print "b:", b - if type(b) is not str: + if not isinstance(b, 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) - - - res.append((eListboxPythonMultiContent.TYPE_TEXT, 170, 0, 350, 25, 0, RT_HALIGN_LEFT, b)) + b = str(b) - return res + x, y, w, h = skin.parameters.get("ServiceInfo",(0, 0, 200, 30)) + xa, ya, wa, ha = skin.parameters.get("ServiceInfoLeft",(0, 0, 200, 25)) + xb, yb, wb, hb = skin.parameters.get("ServiceInfoRight",(220, 0, 350, 25)) + return [ + #PyObject *type, *px, *py, *pwidth, *pheight, *pfnt, *pstring, *pflags; + (eListboxPythonMultiContent.TYPE_TEXT, x, y, w, h, 0, RT_HALIGN_LEFT, ""), + (eListboxPythonMultiContent.TYPE_TEXT, xa, ya, wa, ha, 0, RT_HALIGN_LEFT, a), + (eListboxPythonMultiContent.TYPE_TEXT, xb, yb, wb, hb, 0, RT_HALIGN_LEFT, b) + ] class ServiceInfoList(HTMLComponent, GUIComponent): def __init__(self, source): @@ -43,19 +48,20 @@ class ServiceInfoList(HTMLComponent, GUIComponent): self.l = eListboxPythonMultiContent() self.list = source self.l.setList(self.list) - self.l.setFont(0, gFont("Regular", 23)) + font = skin.fonts.get("ServiceInfo", ("Regular", 23, 25)) + self.l.setFont(0, gFont(font[0], font[1])) + self.l.setItemHeight(font[2]) + + GUI_WIDGET = eListbox - def GUIcreate(self, parent): - self.instance = eListbox(parent) + def postWidgetCreate(self, instance): self.instance.setContent(self.l) - self.instance.setItemHeight(25) - def GUIdelete(self): - self.instance.setContent(None) - self.instance = None +TYPE_SERVICE_INFO = 1 +TYPE_TRANSPONDER_INFO = 2 class ServiceInfo(Screen): - def __init__(self, session): + def __init__(self, session, serviceref=None): Screen.__init__(self, session) self["actions"] = ActionMap(["OkCancelActions", "ColorActions"], @@ -64,60 +70,174 @@ class ServiceInfo(Screen): "cancel": self.close, "red": self.information, "green": self.pids, - "yellow": self.transponder + "yellow": self.transponder, + "blue": self.tuner }, -1) - - service = session.nav.getCurrentService() - if service is not None: - self.info = service.info() - self.feinfo = service.frontendStatusInfo() - if self.feinfo: - print self.feinfo.getFrontendData(False) - else: + + if serviceref: + self.type = TYPE_TRANSPONDER_INFO + self["red"] = Label() + self["green"] = Label() + self["yellow"] = Label() + 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(_("Service")) + self["green"] = Label(_("PIDs")) + self["yellow"] = Label(_("Multiplex")) + self["blue"] = Label(_("Tuner status")) + service = session.nav.getCurrentService() + if service is not None: + self.info = service.info() + self.feinfo = service.frontendInfo() + print self.info.getInfoObject(iServiceInformation.sCAIDs); + else: + self.info = None + self.feinfo = None - self["red"] = Label("Serviceinfo") - self["green"] = Label("PIDs") - self["yellow"] = Label("Transponder") - self["blue"] = Label("") - tlist = [ ] self["infolist"] = ServiceInfoList(tlist) self.onShown.append(self.information) def information(self): - if self.session.nav.getCurrentlyPlayingServiceReference() is not None: - name = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference()).getServiceName() + 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") + 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), + (_("Aspect ratio"), aspect, TYPE_TEXT), + (_("Resolution"), "%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), + (_("Aspect ratio"), aspect, TYPE_TEXT), + (_("Namespace"), self.getServiceInfoValue(iServiceInformation.sNamespace), TYPE_VALUE_HEX, 8), + (_("Service reference"), refstr, TYPE_TEXT)) + self.fillList(Labels) 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)) - self.fillList(Labels) - + if self.transponder_info: + tp_info = ConvertToHumanReadable(self.transponder_info) + conv = { "tuner_type" : _("Type"), + "system" : _("System"), + "modulation" : _("Modulation"), + "orbital_position" : _("Orbital position"), + "frequency" : _("Frequency"), + "symbol_rate" : _("Symbol rate"), + "bandwidth" : _("Bandwidth"), + "polarization" : _("Polarization"), + "inversion" : _("Inversion"), + "pilot" : _("Pilot"), + "rolloff" : _("Roll-off"), + "fec_inner" : _("FEC"), + "code_rate_lp" : _("Code rate LP"), + "code_rate_hp" : _("Code rate HP"), + "constellation" : _("Constellation"), + "transmission_mode" : _("Transmission mode"), + "guard_interval" : _("Guard interval"), + "hierarchy_information" : _("Hierarchy info") } + Labels = [(conv[i], tp_info[i], TYPE_VALUE_DEC) for i in tp_info.keys()] + self.fillList(Labels) + def pids(self): - Labels = ( ("VideoPID", self.getServiceInfoValue(iServiceInformation.sVideoPID), TYPE_VALUE_HEX_DEC, 4), - ("AudioPID", self.getServiceInfoValue(iServiceInformation.sAudioPID), TYPE_VALUE_HEX_DEC, 4), - ("PCRPID", self.getServiceInfoValue(iServiceInformation.sPCRPID), TYPE_VALUE_HEX_DEC, 4), - ("PMTPID", self.getServiceInfoValue(iServiceInformation.sPMTPID), TYPE_VALUE_HEX_DEC, 4), - ("TXTPID", self.getServiceInfoValue(iServiceInformation.sTXTPID), TYPE_VALUE_HEX_DEC, 4), - ("TSID", self.getServiceInfoValue(iServiceInformation.sTSID), TYPE_VALUE_HEX_DEC, 4), - ("ONID", self.getServiceInfoValue(iServiceInformation.sONID), TYPE_VALUE_HEX_DEC, 4), - ("SID", self.getServiceInfoValue(iServiceInformation.sSID), TYPE_VALUE_HEX_DEC, 4)) - self.fillList(Labels) + if self.type == TYPE_SERVICE_INFO: + Labels = ( (_("Video PID"), self.getServiceInfoValue(iServiceInformation.sVideoPID), TYPE_VALUE_HEX_DEC, 4), + (_("Audio PID"), self.getServiceInfoValue(iServiceInformation.sAudioPID), TYPE_VALUE_HEX_DEC, 4), + (_("PCR PID"), self.getServiceInfoValue(iServiceInformation.sPCRPID), TYPE_VALUE_HEX_DEC, 4), + (_("PMT PID"), self.getServiceInfoValue(iServiceInformation.sPMTPID), TYPE_VALUE_HEX_DEC, 4), + (_("TXT PID"), self.getServiceInfoValue(iServiceInformation.sTXTPID), TYPE_VALUE_HEX_DEC, 4), + (_("TSID"), self.getServiceInfoValue(iServiceInformation.sTSID), TYPE_VALUE_HEX_DEC, 4), + (_("ONID"), self.getServiceInfoValue(iServiceInformation.sONID), TYPE_VALUE_HEX_DEC, 4), + (_("SID"), self.getServiceInfoValue(iServiceInformation.sSID), TYPE_VALUE_HEX_DEC, 4)) + self.fillList(Labels) - def transponder(self): - Labels = ( ("Frequency", "11823", TYPE_TEXT), - ("Polarity", "H", TYPE_TEXT)) - self.fillList(Labels) + def showFrontendData(self, real): + if self.type == TYPE_SERVICE_INFO: + frontendData = self.feinfo and self.feinfo.getAll(real) + Labels = self.getFEData(frontendData) + self.fillList(Labels) + def transponder(self): + if self.type == TYPE_SERVICE_INFO: + self.showFrontendData(True) + + def tuner(self): + if self.type == TYPE_SERVICE_INFO: + self.showFrontendData(False) + + def getFEData(self, frontendDataOrg): + if frontendDataOrg and len(frontendDataOrg): + frontendData = ConvertToHumanReadable(frontendDataOrg) + if frontendDataOrg["tuner_type"] == "DVB-S": + data = ((_("NIM"), chr(ord('A')+int(frontendData["tuner_number"])), TYPE_TEXT), + (_("Type"), frontendData["tuner_type"], TYPE_TEXT), + (_("System"), frontendData["system"], TYPE_TEXT), + (_("Modulation"), frontendData["modulation"], TYPE_TEXT), + (_("Orbital position"), frontendData["orbital_position"], TYPE_VALUE_DEC), + (_("Frequency"), frontendData["frequency"], TYPE_VALUE_DEC), + (_("Symbol rate"), frontendData["symbol_rate"], TYPE_VALUE_DEC), + (_("Polarization"), frontendData["polarization"], TYPE_TEXT), + (_("Inversion"), frontendData["inversion"], TYPE_TEXT), + (_("FEC"), frontendData["fec_inner"], TYPE_TEXT), + (_("Pilot"), frontendData.get("pilot", None), TYPE_TEXT), + (_("Roll-off"), frontendData.get("rolloff", None), TYPE_TEXT)) + if nimmanager.isSupportMultistream(int(frontendData["tuner_number"])): + data += ((_("Input Stream ID"), frontendData.get("is_id", 0), TYPE_VALUE_DEC), + (_("PLS Mode"), frontendData.get("pls_mode", None), TYPE_TEXT), + (_("PLS Code"), frontendData.get("pls_code", 0), TYPE_VALUE_DEC)) + return data + elif frontendDataOrg["tuner_type"] == "DVB-C": + return ((_("NIM"), chr(ord('A')+int(frontendData["tuner_number"])), TYPE_TEXT), + (_("Type"), frontendData["tuner_type"], TYPE_TEXT), + (_("Modulation"), frontendData["modulation"], TYPE_TEXT), + (_("Frequency"), frontendData["frequency"], TYPE_VALUE_DEC), + (_("Symbol rate"), frontendData["symbol_rate"], TYPE_VALUE_DEC), + (_("Inversion"), frontendData["inversion"], TYPE_TEXT), + (_("FEC"), frontendData["fec_inner"], TYPE_TEXT)) + elif frontendDataOrg["tuner_type"] == "DVB-T": + data = ((_("NIM"), chr(ord('A')+int(frontendData["tuner_number"])), TYPE_TEXT), + (_("Type"), frontendData["tuner_type"], TYPE_TEXT), + (_("System"), frontendData["system"], TYPE_TEXT), + (_("Frequency"), frontendData["frequency"], TYPE_VALUE_DEC), + (_("Inversion"), frontendData["inversion"], TYPE_TEXT), + (_("Bandwidth"), frontendData["bandwidth"], TYPE_VALUE_DEC), + (_("Code rate LP"), frontendData["code_rate_lp"], TYPE_TEXT), + (_("Code rate HP"), 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 info"), frontendData["hierarchy_information"], TYPE_TEXT)) + if frontendData.has_key("plp_id"): + data += ((_("PLP ID"), frontendData["plp_id"], TYPE_VALUE_DEC), ) + return data + + return [ ] + def fillList(self, Labels): tlist = [ ] for item in Labels: - print item + if item[1] is None: + continue; value = item[1] if len(item) < 4: tlist.append(ServiceInfoListEntry(item[0]+":", value, item[2])) @@ -134,6 +254,6 @@ class ServiceInfo(Screen): if v == -2: v = self.info.getInfoString(what) elif v == -1: - v = "N/A" + v = _("N/A") return v