X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FServiceInfo.py;h=3899968a9e01c9a5d81ccae4830b2e8cd4a80794;hp=a4bb4e02a4d5f0f75cad3cbff145efbef9468ba0;hb=d4ac90a0740a22c86e8f18a49a594e9a8f3746df;hpb=185319be599e9f42cd695da14c01499fc79f68d5 diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py index a4bb4e0..3899968 100644 --- a/lib/python/Screens/ServiceInfo.py +++ b/lib/python/Screens/ServiceInfo.py @@ -5,7 +5,7 @@ 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 RT_HALIGN_LEFT = 0 @@ -51,8 +51,11 @@ class ServiceInfoList(HTMLComponent, GUIComponent): self.instance.setContent(self.l) self.instance.setItemHeight(25) +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,64 +67,103 @@ class ServiceInfo(Screen): "yellow": self.transponder, "blue": self.tuner }, -1) - - service = session.nav.getCurrentService() - if service is not None: - self.info = service.info() - self.feinfo = service.frontendStatusInfo() - print self.info.getInfoObject(iServiceInformation.sCAIDs); - else: - self.info = None + 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) + else: + self.type = TYPE_SERVICE_INFO + self["red"] = Label(_("Serviceinfo")) + self["green"] = Label(_("PIDs")) + self["yellow"] = Label(_("Transponder")) + 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("Tuner status") - 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() is not None: + name = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference()).getServiceName() + 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) 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: + conv = { "type" : _("Transponder Type:"), + "frequency" : _("Frequency:"), + "symbolrate" : _("Symbolrate:"), + "orbital position" : _("Orbital Position:"), + "inversion" : _("Inversion:"), + "fec inner" : _("FEC:"), + "modulation" : _("Modulation:"), + "polarization" : _("Polarization:"), + "roll off" : _("Rolloff:"), + "system" : _("System:"), + "bandwidth" : _("Bandwidth:"), + "code rate lp" : _("Coderate LP:"), + "code rate hp" : _("Coderate HP:"), + "constellation" : _("Constellation:"), + "transmission mode": _("Transmission Mode:"), + "guard interval" : _("Guard Interval:"), + "hierarchy" : _("Hierarchy Information:") } + Labels = [ ] + for i in self.transponder_info.keys(): + Labels.append( (conv[i], self.transponder_info[i], TYPE_TEXT) ) + 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 = ( ("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) + + def showFrontendData(self, real): + if self.type == TYPE_SERVICE_INFO: + frontendData = self.feinfo and self.feinfo.getFrontendData(real) + Labels = self.getFEData(frontendData) + self.fillList(Labels) def transponder(self): - frontendData = self.feinfo.getFrontendData(True) - Labels = self.getFEData(frontendData) - self.fillList(Labels) + if self.type == TYPE_SERVICE_INFO: + self.showFrontendData(True) def tuner(self): - frontendData = self.feinfo.getFrontendData(False) - Labels = self.getFEData(frontendData) - self.fillList(Labels) - + if self.type == TYPE_SERVICE_INFO: + 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["tuner_type"], 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), @@ -156,7 +198,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]))