diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-11-05 08:30:02 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-11-05 08:30:02 +0100 |
| commit | a8fd8e5e6c8a56c2e8dcdfbf7927b7e31221fd9a (patch) | |
| tree | 74b93ccdc96f04b4d272d69f084fe3080731f152 /lib/python/Plugins/Extensions/MediaPlayer | |
| parent | 7560beb3e371704d798259ca1ea927bf4575306c (diff) | |
| parent | 946a71097573dc8abc273d24efd23bab3e5f2fb2 (diff) | |
| download | enigma2-a8fd8e5e6c8a56c2e8dcdfbf7927b7e31221fd9a.tar.gz enigma2-a8fd8e5e6c8a56c2e8dcdfbf7927b7e31221fd9a.zip | |
Merge branch 'master' into bug_236_recordpath
Diffstat (limited to 'lib/python/Plugins/Extensions/MediaPlayer')
| -rw-r--r-- | lib/python/Plugins/Extensions/MediaPlayer/plugin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index 596f2d5a..0e3bdf02 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|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"] = self.filelist self.playlist = MyPlayList() |