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/Plugins | |
| 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/Plugins')
| -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..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() |