diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-01-31 16:20:28 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-01-31 16:20:28 +0000 |
| commit | 82c0483256d5543675bccb486a5e8a453402ba44 (patch) | |
| tree | e038875a1a6fc6ebd0e1dd6ceb3abf4145beda3a | |
| parent | 5655fee2e15bf1cfc0fe06a85e3c864dbfcd41ce (diff) | |
| download | enigma2-82c0483256d5543675bccb486a5e8a453402ba44.tar.gz enigma2-82c0483256d5543675bccb486a5e8a453402ba44.zip | |
fix possible blue screen
| -rw-r--r-- | lib/python/Screens/ServiceInfo.py | 69 |
1 files changed, 33 insertions, 36 deletions
diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py index af53621a..7480779f 100644 --- a/lib/python/Screens/ServiceInfo.py +++ b/lib/python/Screens/ServiceInfo.py @@ -174,42 +174,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 = [ ] |