diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2009-11-04 16:41:12 +0100 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2009-11-04 16:41:12 +0100 |
| commit | 5ded85314f4d8b221b885a443dc797632a2101cd (patch) | |
| tree | 81b9ee9b012236783b842b6fc4390f15154bf508 /lib/python/Components | |
| parent | e6a3b9fdb8f5ac0774a27794b175d79cf0973976 (diff) | |
| parent | aaeba87c8ee1b528dc9660dab9c6980155e878d4 (diff) | |
| download | enigma2-5ded85314f4d8b221b885a443dc797632a2101cd.tar.gz enigma2-5ded85314f4d8b221b885a443dc797632a2101cd.zip | |
Merge branch 'master' into experimental
Conflicts:
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
Diffstat (limited to 'lib/python/Components')
| -rwxr-xr-x | lib/python/Components/FileList.py | 1 | ||||
| -rwxr-xr-x | lib/python/Components/config.py | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py index a0f66bd1..b187ee3e 100755 --- a/lib/python/Components/FileList.py +++ b/lib/python/Components/FileList.py @@ -23,6 +23,7 @@ EXTENSIONS = { "ts": "movie", "avi": "movie", "divx": "movie", + "m4v": "movie", "mpg": "movie", "mpeg": "movie", "mkv": "movie", diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index 876e3a34..d9f2104e 100755 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -1184,7 +1184,10 @@ class ConfigSatlist(ConfigSelection): def __init__(self, list, default = None): if default is not None: default = str(default) - ConfigSelection.__init__(self, choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list], default = default) + choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list] + choices.sort(key = lambda x: int(x[0])) + + ConfigSelection.__init__(self, choices = choices, default = default) def getOrbitalPosition(self): if self.value == "": |