diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-30 13:17:16 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-30 13:17:16 +0200 |
| commit | ad51c4ff74ebc0e5c58d7d96676f0b641e6a0799 (patch) | |
| tree | 5bd9e334d6b4b64fe60c90a4c9b045f940b83b50 /lib/python/Plugins/Extensions | |
| parent | 27d44f46b2e3ca509bb65bb7ca51558328af1040 (diff) | |
| parent | fcb411367b6a2adfc8c2b986cdee6cd9bc3c169f (diff) | |
| download | enigma2-ad51c4ff74ebc0e5c58d7d96676f0b641e6a0799.tar.gz enigma2-ad51c4ff74ebc0e5c58d7d96676f0b641e6a0799.zip | |
Merge branch 'bug_595_fix_pat_parsing' into experimental
Diffstat (limited to 'lib/python/Plugins/Extensions')
| -rwxr-xr-x | 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 e4bdba12..9ae886fc 100755 --- 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|m4v|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() |