diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-14 13:21:33 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-14 13:21:33 +0200 |
| commit | 12e1565871ab397a50384af408b9120aeb35d077 (patch) | |
| tree | 1a09c3d607e45e4c0f60264ce784434252db53dc /lib/python/Plugins/Extensions/MediaPlayer | |
| parent | 3ba5a94fb9e11aba156cd841a6e3feff030f08f3 (diff) | |
| parent | d21824019fe93603f1c05c7263ef7570aa60e135 (diff) | |
| download | enigma2-12e1565871ab397a50384af408b9120aeb35d077.tar.gz enigma2-12e1565871ab397a50384af408b9120aeb35d077.zip | |
Merge remote branch 'remotes/origin/bug_587_new_internally_connectable_and_unsupported_tuner_management'
Diffstat (limited to 'lib/python/Plugins/Extensions/MediaPlayer')
| -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 9ae886fc..e4bdba12 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|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|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() |