diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-01-05 18:52:12 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-01-05 18:52:12 +0100 |
| commit | d5a16c6e9d0ee1cc2dc0d65b4321842dea4b0891 (patch) | |
| tree | bcc8732c3175a4f7b4f862d9f425bf9b44f81519 /lib/python | |
| parent | 5dda545b5e85bb7f8b5bfc25cc6a7d96e2f830cd (diff) | |
| parent | 8c0e6b4a527f5666195683b7cc28c278a636da0d (diff) | |
| download | enigma2-d5a16c6e9d0ee1cc2dc0d65b4321842dea4b0891.tar.gz enigma2-d5a16c6e9d0ee1cc2dc0d65b4321842dea4b0891.zip | |
Merge branch 'master' into 2.7
Diffstat (limited to 'lib/python')
| -rwxr-xr-x | lib/python/Components/FileList.py | 1 | ||||
| -rwxr-xr-x | lib/python/Plugins/Extensions/MediaPlayer/plugin.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py index 222512ea..841a2fe5 100755 --- a/lib/python/Components/FileList.py +++ b/lib/python/Components/FileList.py @@ -23,6 +23,7 @@ EXTENSIONS = { "ts": "movie", "avi": "movie", "divx": "movie", + "m4v": "movie", "mpg": "movie", "mpeg": "movie", "mkv": "movie", diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py index a2422be7..036bbbb9 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|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() |