diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 14:47:32 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 14:47:32 +0100 |
| commit | 4510fa62a33b31fec442fd0d77eb682d93ebf7e6 (patch) | |
| tree | b5658cf227ea59640a09a890e96a22bfa814cea6 /lib/python | |
| parent | eccbf5ccedceaf21d4d2557e5ef12ef9a53930ca (diff) | |
| parent | a2897a03034c3a2c176df4fdd2f7f5d32d830270 (diff) | |
| download | enigma2-4510fa62a33b31fec442fd0d77eb682d93ebf7e6.tar.gz enigma2-4510fa62a33b31fec442fd0d77eb682d93ebf7e6.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
Conflicts:
lib/python/Components/Converter/StringList.py
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/Converter/StringList.py | 2 | ||||
| -rw-r--r-- | lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py | 2 | ||||
| -rw-r--r-- | lib/python/Tools/Directories.py | 2 | ||||
| -rw-r--r-- | lib/python/Tools/Transponder.py | 7 |
4 files changed, 8 insertions, 5 deletions
diff --git a/lib/python/Components/Converter/StringList.py b/lib/python/Components/Converter/StringList.py index 08794b34..d424d39f 100644 --- a/lib/python/Components/Converter/StringList.py +++ b/lib/python/Components/Converter/StringList.py @@ -48,4 +48,4 @@ class StringList(Converter): index = property(getIndex, setIndex) def entry_changed(self, index): - self.downstream_elements.entry_changed(index)
\ No newline at end of file + self.downstream_elements.entry_changed(index) diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py index 6d2ddce3..fa533c0b 100644 --- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py +++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py @@ -355,7 +355,7 @@ class PositionerSetup(Screen): self["snr_bar"].update() self["ber_bar"].update() self["lock_state"].update() - transponderdata = ConvertToHumanReadable(self.tuner.getTransponderData()) + transponderdata = ConvertToHumanReadable(self.tuner.getTransponderData(), "DVB-S") self["frequency_value"].setText(str(transponderdata.get("frequency"))) self["symbolrate_value"].setText(str(transponderdata.get("symbol_rate"))) self["fec_value"].setText(str(transponderdata.get("fec_inner"))) diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py index 7dcd5876..b2e43a49 100644 --- a/lib/python/Tools/Directories.py +++ b/lib/python/Tools/Directories.py @@ -167,7 +167,7 @@ def getRecordingFilename(basename, dirname = None): basename = basename.replace('\xc2\x86', '').replace('\xc2\x87', '') for c in basename: - if c in non_allowed_characters: + if c in non_allowed_characters or ord(c) < 32: c = "_" filename += c diff --git a/lib/python/Tools/Transponder.py b/lib/python/Tools/Transponder.py index f37603c5..6868929c 100644 --- a/lib/python/Tools/Transponder.py +++ b/lib/python/Tools/Transponder.py @@ -1,8 +1,9 @@ from enigma import eDVBFrontendParametersSatellite, eDVBFrontendParametersCable, eDVBFrontendParametersTerrestrial -def ConvertToHumanReadable(tp): +def ConvertToHumanReadable(tp, type = None): ret = { } - type = tp.get("tuner_type", "None") + if type is None: + type = tp.get("tuner_type", "None") if type == "DVB-S": ret["tuner_type"] = _("Satellite") ret["inversion"] = { @@ -111,6 +112,8 @@ def ConvertToHumanReadable(tp): eDVBFrontendParametersTerrestrial.Inversion_Unknown : _("Auto"), eDVBFrontendParametersTerrestrial.Inversion_On : _("On"), eDVBFrontendParametersTerrestrial.Inversion_Off : _("Off")}[tp["inversion"]] + else: + print "ConvertToHumanReadable: no or unknown type in tpdata dict!" for x in tp.keys(): if not ret.has_key(x): ret[x] = tp[x] |