From bfcc745e958a34a457086f003013ca9b69959dea Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 19 Jan 2009 22:30:53 +0100 Subject: [PATCH] getInfoObject sTransponderData now also returns transponder data values (not strings) .. compatible to getFrontendData --- lib/python/Screens/ServiceInfo.py | 20 +-- lib/service/servicedvb.cpp | 225 ++++-------------------------- 2 files changed, 38 insertions(+), 207 deletions(-) diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py index 4606f883..d233c981 100644 --- a/lib/python/Screens/ServiceInfo.py +++ b/lib/python/Screens/ServiceInfo.py @@ -134,24 +134,24 @@ class ServiceInfo(Screen): conv = { "type" : _("Transponder Type"), "system" : _("System"), "modulation" : _("Modulation"), - "orbital position" : _("Orbital Position"), + "orbital_position" : _("Orbital Position"), "frequency" : _("Frequency"), - "symbolrate" : _("Symbolrate"), + "symbol_rate" : _("Symbolrate"), "bandwidth" : _("Bandwidth"), "polarization" : _("Polarization"), "inversion" : _("Inversion"), "pilot" : _("Pilot"), - "roll off" : _("Rolloff"), - "fec inner" : _("FEC"), - "code rate lp" : _("Coderate LP"), - "code rate hp" : _("Coderate HP"), + "rolloff" : _("Rolloff"), + "fec_inner" : _("FEC"), + "code_rate_lp" : _("Coderate LP"), + "code_rate_hp" : _("Coderate HP"), "constellation" : _("Constellation"), - "transmission mode": _("Transmission Mode"), - "guard interval" : _("Guard Interval"), - "hierarchy" : _("Hierarchy Information") } + "transmission_mode": _("Transmission Mode"), + "guard_interval" : _("Guard Interval"), + "hierarchy_information": _("Hierarchy Information") } Labels = [ ] for i in self.transponder_info.keys(): - Labels.append( (conv[i], self.transponder_info[i], TYPE_TEXT) ) + Labels.append( (conv[i], self.transponder_info[i], TYPE_VALUE_DEC) ) self.fillList(Labels) def pids(self): diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index bcf005e4..0dbc8be0 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -96,219 +96,50 @@ int eStaticServiceDVBInformation::isPlayable(const eServiceReference &ref, const return false; } -static void PutToDictAsStr(ePyObject &dict, const char*key, long value) -{ - ePyObject item = PyString_FromFormat("%d", value); - if (item) - { - if (PyDict_SetItemString(dict, key, item)) - eDebug("put %s to dict failed", key); - Py_DECREF(item); - } - else - eDebug("could not create PyObject for %s", key); -} - extern void PutToDict(ePyObject &dict, const char*key, long value); // defined in dvb/frontend.cpp extern void PutToDict(ePyObject &dict, const char*key, ePyObject item); // defined in dvb/frontend.cpp extern void PutToDict(ePyObject &dict, const char*key, const char *value); // defined in dvb/frontend.cpp void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &feparm) { - const char *tmp=0; - PutToDict(dict, "type", "Satellite"); - PutToDictAsStr(dict, "frequency", feparm.frequency); - PutToDictAsStr(dict, "symbolrate", feparm.symbol_rate); - PutToDictAsStr(dict, "orbital position", feparm.orbital_position); - switch (feparm.inversion) - { - case eDVBFrontendParametersSatellite::Inversion_On: tmp="ON"; break; - case eDVBFrontendParametersSatellite::Inversion_Off: tmp="OFF"; break; - default: - case eDVBFrontendParametersSatellite::Inversion_Unknown: tmp="AUTO"; break; - } - PutToDict(dict, "inversion", tmp); - switch (feparm.fec) - { - case eDVBFrontendParametersSatellite::FEC_None: tmp="NONE"; break; - case eDVBFrontendParametersSatellite::FEC_1_2: tmp="1/2"; break; - case eDVBFrontendParametersSatellite::FEC_2_3: tmp="2/3"; break; - case eDVBFrontendParametersSatellite::FEC_3_4: tmp="3/4"; break; - case eDVBFrontendParametersSatellite::FEC_5_6: tmp="5/6"; break; - case eDVBFrontendParametersSatellite::FEC_7_8: tmp="7/8"; break; - case eDVBFrontendParametersSatellite::FEC_3_5: tmp="3/5"; break; - case eDVBFrontendParametersSatellite::FEC_4_5: tmp="4/5"; break; - case eDVBFrontendParametersSatellite::FEC_8_9: tmp="8/9"; break; - case eDVBFrontendParametersSatellite::FEC_9_10: tmp="9/10"; break; - default: - case eDVBFrontendParametersSatellite::FEC_Auto: tmp="AUTO"; break; - } - PutToDict(dict, "fec inner", tmp); - switch (feparm.modulation) + PutToDict(dict, "type", "DVB-S"); + PutToDict(dict, "frequency", feparm.frequency); + PutToDict(dict, "symbol_rate", feparm.symbol_rate); + PutToDict(dict, "orbital_position", feparm.orbital_position); + PutToDict(dict, "inversion", feparm.inversion); + PutToDict(dict, "fec_inner", feparm.fec); + PutToDict(dict, "modulation", feparm.modulation); + PutToDict(dict, "polarization", feparm.polarisation); + if (feparm.system == eDVBFrontendParametersSatellite::System_DVB_S2) { - case eDVBFrontendParametersSatellite::Modulation_Auto: tmp="AUTO"; break; - case eDVBFrontendParametersSatellite::Modulation_QPSK: tmp="QPSK"; break; - case eDVBFrontendParametersSatellite::Modulation_8PSK: tmp="8PSK"; break; - case eDVBFrontendParametersSatellite::Modulation_QAM16: tmp="QAM16"; break; + PutToDict(dict, "rolloff", feparm.rolloff); + PutToDict(dict, "pilot", feparm.pilot); } - PutToDict(dict, "modulation", tmp); - switch(feparm.polarisation) - { - case eDVBFrontendParametersSatellite::Polarisation_Horizontal: tmp="HORIZONTAL"; break; - case eDVBFrontendParametersSatellite::Polarisation_Vertical: tmp="VERTICAL"; break; - case eDVBFrontendParametersSatellite::Polarisation_CircularLeft: tmp="CIRCULAR LEFT"; break; - default: - case eDVBFrontendParametersSatellite::Polarisation_CircularRight: tmp="CIRCULAR RIGHT"; break; - } - PutToDict(dict, "polarization", tmp); - switch(feparm.system) - { - default: - case eDVBFrontendParametersSatellite::System_DVB_S: tmp="DVB-S"; break; - case eDVBFrontendParametersSatellite::System_DVB_S2: - switch(feparm.rolloff) - { - default: - case eDVBFrontendParametersSatellite::RollOff_alpha_0_35: tmp="0.35"; break; - case eDVBFrontendParametersSatellite::RollOff_alpha_0_25: tmp="0.25"; break; - case eDVBFrontendParametersSatellite::RollOff_alpha_0_20: tmp="0.20"; break; - } - PutToDict(dict, "roll off", tmp); - switch(feparm.pilot) - { - case eDVBFrontendParametersSatellite::Pilot_On: tmp="ON"; break; - case eDVBFrontendParametersSatellite::Pilot_Off: tmp="OFF"; break; - default: - case eDVBFrontendParametersSatellite::Pilot_Unknown: tmp="AUTO"; break; - } - PutToDict(dict, "pilot", tmp); - tmp="DVB-S2"; - break; - } - PutToDict(dict, "system", tmp); + PutToDict(dict, "system", feparm.system); } void PutTerrestrialDataToDict(ePyObject &dict, eDVBFrontendParametersTerrestrial &feparm) { - PutToDict(dict, "type", "Terrestrial"); - PutToDictAsStr(dict, "frequency", feparm.frequency); - const char *tmp=0; - switch (feparm.bandwidth) - { - case eDVBFrontendParametersTerrestrial::Bandwidth_8MHz: tmp="8 MHz"; break; - case eDVBFrontendParametersTerrestrial::Bandwidth_7MHz: tmp="7 MHz"; break; - case eDVBFrontendParametersTerrestrial::Bandwidth_6MHz: tmp="6 MHz"; break; - default: - case eDVBFrontendParametersTerrestrial::Bandwidth_Auto: tmp="AUTO"; break; - } - PutToDict(dict, "bandwidth", tmp); - switch (feparm.code_rate_LP) - { - case eDVBFrontendParametersTerrestrial::FEC_1_2: tmp="1/2"; break; - case eDVBFrontendParametersTerrestrial::FEC_2_3: tmp="2/3"; break; - case eDVBFrontendParametersTerrestrial::FEC_3_4: tmp="3/4"; break; - case eDVBFrontendParametersTerrestrial::FEC_5_6: tmp="5/6"; break; - case eDVBFrontendParametersTerrestrial::FEC_7_8: tmp="7/8"; break; - default: - case eDVBFrontendParametersTerrestrial::FEC_Auto: tmp="AUTO"; break; - } - PutToDict(dict, "code rate lp", tmp); - switch (feparm.code_rate_HP) - { - case eDVBFrontendParametersTerrestrial::FEC_1_2: tmp="1/2"; break; - case eDVBFrontendParametersTerrestrial::FEC_2_3: tmp="2/3"; break; - case eDVBFrontendParametersTerrestrial::FEC_3_4: tmp="3/4"; break; - case eDVBFrontendParametersTerrestrial::FEC_5_6: tmp="5/6"; break; - case eDVBFrontendParametersTerrestrial::FEC_7_8: tmp="7/8"; break; - default: - case eDVBFrontendParametersTerrestrial::FEC_Auto: tmp="AUTO"; break; - } - PutToDict(dict, "code rate hp", tmp); - switch (feparm.modulation) - { - case eDVBFrontendParametersTerrestrial::Modulation_QPSK: tmp="QPSK"; break; - case eDVBFrontendParametersTerrestrial::Modulation_QAM16: tmp="QAM16"; break; - case eDVBFrontendParametersTerrestrial::Modulation_QAM64: tmp="QAM64"; break; - default: - case eDVBFrontendParametersTerrestrial::Modulation_Auto: tmp="AUTO"; break; - } - PutToDict(dict, "constellation", tmp); - switch (feparm.transmission_mode) - { - case eDVBFrontendParametersTerrestrial::TransmissionMode_2k: tmp="2k"; break; - case eDVBFrontendParametersTerrestrial::TransmissionMode_8k: tmp="8k"; break; - default: - case eDVBFrontendParametersTerrestrial::TransmissionMode_Auto: tmp="AUTO"; break; - } - PutToDict(dict, "transmission mode", tmp); - switch (feparm.guard_interval) - { - case eDVBFrontendParametersTerrestrial::GuardInterval_1_32: tmp="1/32"; break; - case eDVBFrontendParametersTerrestrial::GuardInterval_1_16: tmp="1/16"; break; - case eDVBFrontendParametersTerrestrial::GuardInterval_1_8: tmp="1/8"; break; - case eDVBFrontendParametersTerrestrial::GuardInterval_1_4: tmp="1/4"; break; - default: - case eDVBFrontendParametersTerrestrial::GuardInterval_Auto: tmp="AUTO"; break; - } - PutToDict(dict, "guard interval", tmp); - switch (feparm.hierarchy) - { - case eDVBFrontendParametersTerrestrial::Hierarchy_None: tmp="NONE"; break; - case eDVBFrontendParametersTerrestrial::Hierarchy_1: tmp="1"; break; - case eDVBFrontendParametersTerrestrial::Hierarchy_2: tmp="2"; break; - case eDVBFrontendParametersTerrestrial::Hierarchy_4: tmp="4"; break; - default: - case eDVBFrontendParametersTerrestrial::Hierarchy_Auto: tmp="AUTO"; break; - } - PutToDict(dict, "hierarchy", tmp); - switch (feparm.inversion) - { - case eDVBFrontendParametersSatellite::Inversion_On: tmp="ON"; break; - case eDVBFrontendParametersSatellite::Inversion_Off: tmp="OFF"; break; - default: - case eDVBFrontendParametersSatellite::Inversion_Unknown: tmp="AUTO"; break; - } - PutToDict(dict, "inversion", tmp); + PutToDict(dict, "type", "DVB-T"); + PutToDict(dict, "frequency", feparm.frequency); + PutToDict(dict, "bandwidth", feparm.bandwidth); + PutToDict(dict, "code_rate_lp", feparm.code_rate_LP); + PutToDict(dict, "code_rate_hp", feparm.code_rate_HP); + PutToDict(dict, "constellation", feparm.modulation); + PutToDict(dict, "transmission_mode", feparm.transmission_mode); + PutToDict(dict, "guard_interval", feparm.guard_interval); + PutToDict(dict, "hierarchy_information", feparm.hierarchy); + PutToDict(dict, "inversion", feparm.inversion); } void PutCableDataToDict(ePyObject &dict, eDVBFrontendParametersCable &feparm) { - const char *tmp=0; - PutToDict(dict, "type", "Cable"); - PutToDictAsStr(dict, "frequency", feparm.frequency); - PutToDictAsStr(dict, "symbolrate", feparm.symbol_rate); - switch (feparm.modulation) - { - case eDVBFrontendParametersCable::Modulation_QAM16: tmp="QAM16"; break; - case eDVBFrontendParametersCable::Modulation_QAM32: tmp="QAM32"; break; - case eDVBFrontendParametersCable::Modulation_QAM64: tmp="QAM64"; break; - case eDVBFrontendParametersCable::Modulation_QAM128: tmp="QAM128"; break; - case eDVBFrontendParametersCable::Modulation_QAM256: tmp="QAM256"; break; - default: - case eDVBFrontendParametersCable::Modulation_Auto: tmp="AUTO"; break; - } - PutToDict(dict, "modulation", tmp); - switch (feparm.inversion) - { - case eDVBFrontendParametersCable::Inversion_On: tmp="ON"; break; - case eDVBFrontendParametersCable::Inversion_Off: tmp="OFF"; break; - default: - case eDVBFrontendParametersCable::Inversion_Unknown: tmp="AUTO"; break; - } - PutToDict(dict, "inversion", tmp); - switch (feparm.fec_inner) - { - case eDVBFrontendParametersCable::FEC_None: tmp="NONE"; break; - case eDVBFrontendParametersCable::FEC_1_2: tmp="1/2"; break; - case eDVBFrontendParametersCable::FEC_2_3: tmp="2/3"; break; - case eDVBFrontendParametersCable::FEC_3_4: tmp="3/4"; break; - case eDVBFrontendParametersCable::FEC_5_6: tmp="5/6"; break; - case eDVBFrontendParametersCable::FEC_7_8: tmp="7/8"; break; - case eDVBFrontendParametersCable::FEC_8_9: tmp="8/9"; break; - default: - case eDVBFrontendParametersCable::FEC_Auto: tmp="AUTO"; break; - } - PutToDict(dict, "fec inner", tmp); + PutToDict(dict, "type", "DVB-C"); + PutToDict(dict, "frequency", feparm.frequency); + PutToDict(dict, "symbol_rate", feparm.symbol_rate); + PutToDict(dict, "modulation", feparm.modulation); + PutToDict(dict, "inversion", feparm.inversion); + PutToDict(dict, "fec_inner", feparm.fec_inner); } PyObject *eStaticServiceDVBInformation::getInfoObject(const eServiceReference &r, int what) -- 2.30.2