diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-14 14:01:28 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-14 14:01:28 +0200 |
| commit | 0221901d960f4935240dc7d5e8e44ace748e1223 (patch) | |
| tree | f4b51030647c4154568a26bac57dcf59e7985aa3 /lib/python/Plugins/Extensions/MediaPlayer/plugin.py | |
| parent | d632d90b89b9da41fc164f99ca5dde03c4608550 (diff) | |
| download | enigma2-0221901d960f4935240dc7d5e8e44ace748e1223.tar.gz enigma2-0221901d960f4935240dc7d5e8e44ace748e1223.zip | |
Revert "Revert "disable m2ts support for release 2.6""
This reverts commit e5953c16c3ff3664f0f7a763f242a3eb69fed19d.
Diffstat (limited to 'lib/python/Plugins/Extensions/MediaPlayer/plugin.py')
| -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() |