From: Felix Domke <tmbinc@elitedvb.net>
Date: Wed, 1 Apr 2009 19:51:59 +0000 (+0200)
Subject: Merge branch 'master' of git.opendreambox.org:/git/enigma2
X-Git-Tag: 2.6.0~347
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/36adf5ca9728a2edc5b1e19bf98e95006a68bcc0?hp=39d32bba6ecbc88f6d6865e8467d750ba6f20c20

Merge branch 'master' of git.opendreambox.org:/git/enigma2
---

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index f9697094..54bb1acf 100755
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -26,7 +26,8 @@ EXTENSIONS = {
 		"mpg": "movie",
 		"mpeg": "movie",
 		"mkv": "movie",
-		"mp4": "movie"
+		"mp4": "movie",
+		"mov": "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 e8504ff0..b0aa6274 100644
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -111,7 +111,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|mkv|mp4|m4a|dat|flac)", 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|mkv|mp4|m4a|dat|flac|mov)", 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 569272b0..b1764eb4 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -40,6 +40,7 @@ eServiceFactoryMP3::eServiceFactoryMP3()
 		extensions.push_back("dat");
 		extensions.push_back("flac");
 		extensions.push_back("mp4");
+		extensions.push_back("mov");
 		extensions.push_back("m4a");
 		sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
 	}
@@ -223,7 +224,7 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 		sourceinfo.containertype = ctAVI;
 		sourceinfo.is_video = TRUE;
 	}
-	else if ( strcasecmp(ext, ".mp4") == 0 )
+	else if ( strcasecmp(ext, ".mp4") == 0 || strcasecmp(ext, ".mov") == 0)
 	{
 		sourceinfo.containertype = ctMP4;
 		sourceinfo.is_video = TRUE;