added m4v file extension to media player capabilities
Conflicts:
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
"ts": "movie",
"avi": "movie",
"divx": "movie",
"ts": "movie",
"avi": "movie",
"divx": "movie",
"mpg": "movie",
"mpeg": "movie",
"mkv": "movie",
"mpg": "movie",
"mpeg": "movie",
"mkv": "movie",
# '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|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|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"] = self.filelist
self.playlist = MyPlayList()
self["filelist"] = self.filelist
self.playlist = MyPlayList()