From 3292d021b8caf9b02c3a1a942a0f9572861db3e3 Mon Sep 17 00:00:00 2001 From: chang Date: Mon, 14 Jan 2013 11:15:14 +0900 Subject: [PATCH] support dts/3gp/3g2/mts playback. --- lib/python/Components/FileList.py | 5 +++++ lib/python/Plugins/Extensions/MediaPlayer/plugin.py | 2 +- lib/service/servicemp3.cpp | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py index 1b7e81f..e78912c 100755 --- a/lib/python/Components/FileList.py +++ b/lib/python/Components/FileList.py @@ -16,6 +16,7 @@ EXTENSIONS = { "wav": "music", "ogg": "music", "flac": "music", + "dts": "dts", "jpg": "picture", "jpeg": "picture", "png": "picture", @@ -29,7 +30,11 @@ EXTENSIONS = { "mkv": "movie", "mp4": "movie", "mov": "movie", + "flv": "movie", "m2ts": "movie", + "mts": "movie", + "3gp": "movie", + "3g2": "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 4a7ab9d..f158f21 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|m2ts|flv)", 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|flv|dts|3gp|3g2|mts)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls") self["filelist"] = self.filelist self.playlist = MyPlayList() diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index b0077d7..6aed865 100755 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -48,6 +48,9 @@ eServiceFactoryMP3::eServiceFactoryMP3() extensions.push_back("mov"); extensions.push_back("m4a"); extensions.push_back("flv"); + extensions.push_back("3gp"); + extensions.push_back("3g2"); + extensions.push_back("dts"); sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions); } -- 2.7.4