aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2008-12-03 12:07:17 +0100
committerghost <andreas.monzner@multimedia-labs.de>2008-12-03 12:07:17 +0100
commit6f49c4c722264f8735a92752375619d1025b3b99 (patch)
treea5e01b1ae8f13e1a0000d4a47498ab6660a1693d /lib/python
parente68c41e73e309fd57a9a467e6102f3583a523ce8 (diff)
parent0a2edb202a5a94dc97d016457b841b1eb7df1f02 (diff)
downloadenigma2-6f49c4c722264f8735a92752375619d1025b3b99.tar.gz
enigma2-6f49c4c722264f8735a92752375619d1025b3b99.zip
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Plugins/Extensions/MediaPlayer/plugin.py2
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 41e6ad18..3d1889b9 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|wav|wave|m3u|pls|e2pls|mpg|vob|avi|mkv|mp4|dat|flac|divx)", 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)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls")
self["filelist"] = self.filelist
self.playlist = MyPlayList()