diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-26 15:02:25 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-26 15:02:25 +0100 |
| commit | d98f00f0fdd8b95b819b17c1d4779610c657c198 (patch) | |
| tree | d23a9c8007eff9e0c268befe8f930f458ac2981a /lib/python | |
| parent | c4a0d51174feca310d0c45cc34be3c910a306228 (diff) | |
| parent | 070b9256befecb72bbdc7052aef61e5f2f0b9515 (diff) | |
| download | enigma2-d98f00f0fdd8b95b819b17c1d4779610c657c198.tar.gz enigma2-d98f00f0fdd8b95b819b17c1d4779610c657c198.zip | |
Merge branch 'bug_124_m2ts_support' into experimental
Conflicts:
lib/dvb/pmt.cpp
lib/service/Makefile.am
Diffstat (limited to 'lib/python')
| -rwxr-xr-x | lib/python/Components/FileList.py | 3 | ||||
| -rwxr-xr-x | lib/python/Plugins/Extensions/MediaPlayer/plugin.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py index 1d71514b..1b7e81f5 100755 --- a/lib/python/Components/FileList.py +++ b/lib/python/Components/FileList.py @@ -28,7 +28,8 @@ EXTENSIONS = { "mpeg": "movie", "mkv": "movie", "mp4": "movie", - "mov": "movie" + "mov": "movie", + "m2ts": "movie", } def FileEntryComponent(name, absolute = None, isDir = False): diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index 9ae886fc..d61dbc76 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|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|m4v|mkv|mp4|m4a|dat|flac|mov|m2ts)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls") self["filelist"] = self.filelist self.playlist = MyPlayList() |