added media file format. (wmv,wma,asf)

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index e78912c..4c5b98d 100755 (executable)
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -35,6 +35,9 @@ EXTENSIONS = {
                "mts": "movie",
                "3gp": "movie",
                "3g2": "movie",
                "mts": "movie",
                "3gp": "movie",
                "3g2": "movie",

+               "wmv": "movie",
+               "asf": "movie",
+               "wma": "music",

        }
 
 def FileEntryComponent(name, absolute = None, isDir = False):
        }
 
 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 022fd45..3bf2a14 100755 (executable)
--- 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()
 
                # '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|dts|3gp|3g2|mts)", 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|wmv|asf|wma)", useServiceRef = True, additionalExtensions = "4098:m3u 4098:e2pls 4098:pls")

                self["filelist"] = self.filelist
 
                self.playlist = MyPlayList()
                self["filelist"] = self.filelist
 
                self.playlist = MyPlayList()

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index bb75a06..beee3a9 100755 (executable)
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -51,6 +51,9 @@ eServiceFactoryMP3::eServiceFactoryMP3()
                extensions.push_back("3gp");
                extensions.push_back("3g2");
                extensions.push_back("dts");
                extensions.push_back("3gp");
                extensions.push_back("3g2");
                extensions.push_back("dts");

+               extensions.push_back("wmv");
+               extensions.push_back("asf");
+               extensions.push_back("wma");

                sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
        }
 
                sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
        }