From 7b180a4c6733c69679905bf3c4df31e946791229 Mon Sep 17 00:00:00 2001 From: Jonathan Stafford Date: Thu, 26 Jan 2012 10:46:17 +0800 Subject: [PATCH 1/2] Fixed bug #900727: Phonon backend no longer plays .mp4 video files Fixes: https://launchpad.net/bugs/900727 --- openlp/core/ui/media/phononplayer.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openlp/core/ui/media/phononplayer.py b/openlp/core/ui/media/phononplayer.py index 5203c5960..6e1dec918 100644 --- a/openlp/core/ui/media/phononplayer.py +++ b/openlp/core/ui/media/phononplayer.py @@ -51,6 +51,7 @@ ADDITIONAL_EXT = { u'video/x-matroska': [u'.mpv', u'.mkv'], u'video/x-wmv': [u'.wmv'], u'video/x-mpg': [u'.mpg'], + u'video/mpeg' : [u'.mp4', u'.mts'], u'video/x-ms-wmv': [u'.wmv']} @@ -89,6 +90,7 @@ class PhononPlayer(MediaPlayer): ext = u'*%s' % extension if ext not in list: list.append(ext) + print ext log.info(u'MediaPlugin: %s additional extensions: %s' % (mimetype, u' '.join(self.additional_extensions[mimetype]))) From 312a02f14b7bba824221d81d0b9430e98301c8ed Mon Sep 17 00:00:00 2001 From: Jonathan Stafford Date: Thu, 26 Jan 2012 10:51:25 +0800 Subject: [PATCH 2/2] Fixed typo Fixes: https://launchpad.net/bugs/900727 --- openlp/core/ui/media/phononplayer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openlp/core/ui/media/phononplayer.py b/openlp/core/ui/media/phononplayer.py index 6e1dec918..57d1f7663 100644 --- a/openlp/core/ui/media/phononplayer.py +++ b/openlp/core/ui/media/phononplayer.py @@ -90,7 +90,6 @@ class PhononPlayer(MediaPlayer): ext = u'*%s' % extension if ext not in list: list.append(ext) - print ext log.info(u'MediaPlugin: %s additional extensions: %s' % (mimetype, u' '.join(self.additional_extensions[mimetype])))