From 4fe68f43c6609ba2ab55269915de406b5cf3f351 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 22 Aug 2013 11:02:18 +0200 Subject: [PATCH] Fix bug #1215302 by adding the .divx extension to the list in vlcplayer Fixes: https://launchpad.net/bugs/1215302 --- openlp/core/ui/media/vlcplayer.py | 3 +- openlp/core/ui/media/webkitplayer.py | 46 ++++++++++++++-------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index 11f451b4a..845382a28 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -89,7 +89,8 @@ VIDEO_EXT = [ u'*.xa', u'*.iso', u'*.vob', - u'*.webm' + u'*.webm', + u'*.divx' ] diff --git a/openlp/core/ui/media/webkitplayer.py b/openlp/core/ui/media/webkitplayer.py index 71a19b768..666e6abd8 100644 --- a/openlp/core/ui/media/webkitplayer.py +++ b/openlp/core/ui/media/webkitplayer.py @@ -229,32 +229,32 @@ FLASH_HTML = u""" """ VIDEO_EXT = [ - u'*.3gp' - , u'*.3gpp' - , u'*.3g2' - , u'*.3gpp2' - , u'*.aac' - , u'*.flv' - , u'*.f4a' - , u'*.f4b' - , u'*.f4p' - , u'*.f4v' - , u'*.mov' - , u'*.m4a' - , u'*.m4b' - , u'*.m4p' - , u'*.m4v' - , u'*.mkv' - , u'*.mp4' - , u'*.ogv' - , u'*.webm' - , u'*.mpg', u'*.wmv', u'*.mpeg', u'*.avi' - , u'*.swf' + u'*.3gp', + u'*.3gpp', + u'*.3g2', + u'*.3gpp2', + u'*.aac', + u'*.flv', + u'*.f4a', + u'*.f4b', + u'*.f4p', + u'*.f4v', + u'*.mov', + u'*.m4a', + u'*.m4b', + u'*.m4p', + u'*.m4v', + u'*.mkv', + u'*.mp4', + u'*.ogv', + u'*.webm', + u'*.mpg', u'*.wmv', u'*.mpeg', u'*.avi', + u'*.swf' ] AUDIO_EXT = [ - u'*.mp3' - , u'*.ogg' + u'*.mp3', + u'*.ogg' ]