diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-11-05 08:48:33 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-11-05 08:48:33 +0100 |
| commit | f71de4386db42aad0a29d76c2e2ed8dd26796a57 (patch) | |
| tree | 7ed54065ea12446536e953c68a7a0f1688173eb5 /lib/python | |
| parent | 8c877cd5c0fa7f79f1191ce9c5cc112abfcd0a68 (diff) | |
| parent | 5ded85314f4d8b221b885a443dc797632a2101cd (diff) | |
| download | enigma2-f71de4386db42aad0a29d76c2e2ed8dd26796a57.tar.gz enigma2-f71de4386db42aad0a29d76c2e2ed8dd26796a57.zip | |
Merge branch 'experimental' of git.opendreambox.org:/git/enigma2 into experimental
Diffstat (limited to 'lib/python')
| -rwxr-xr-x | lib/python/Components/FileList.py | 1 | ||||
| -rwxr-xr-x | lib/python/Components/config.py | 5 | ||||
| -rw-r--r-- | lib/python/Plugins/Extensions/MediaPlayer/plugin.py | 2 |
3 files changed, 6 insertions, 2 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 == "": diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index 596f2d5a..c1badb24 100644 --- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py @@ -110,7 +110,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB # 'None' is magic to start at the list of mountpoints defaultDir = config.mediaplayer.defaultDir.getValue() - self.filelist = FileList(defaultDir, matchingPattern = "(?i)^.*\.(mp2|mp3|ogg|ts|m2ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|mkv|mp4|m4a|dat|flac|mov)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls") + self.filelist = FileList(defaultDir, matchingPattern = "(?i)^.*\.(mp2|mp3|ogg|ts|m2ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|m4v|mkv|mp4|m4a|dat|flac|mov)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls") self["filelist"] = self.filelist self.playlist = MyPlayList() |