diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-12-03 17:56:03 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-12-03 17:56:03 +0100 |
| commit | 0cb206d2c07cb9e4130e13234e3fd59b127421a8 (patch) | |
| tree | 07bcbcc638a6012d32b0574531cf0bd8304484ae /lib/python/Plugins/Extensions/MediaPlayer/plugin.py | |
| parent | 99a717e9813eab30cd34f5da6f4a5ab6e791dc1f (diff) | |
| parent | e9272c492c7a3c7fd8a1225a4baa6bee2a02eea8 (diff) | |
| download | enigma2-0cb206d2c07cb9e4130e13234e3fd59b127421a8.tar.gz enigma2-0cb206d2c07cb9e4130e13234e3fd59b127421a8.zip | |
Merge branch 'master' into bug_245_record_playback_fixes
Diffstat (limited to 'lib/python/Plugins/Extensions/MediaPlayer/plugin.py')
| -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..98bc060c 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|m4v|mkv|mp4|m4a|dat|flac|mov)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls") self["filelist"] = self.filelist self.playlist = MyPlayList() |