openlp-core team mailing list archive

[Raoul Snyman <raoul@xxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-1215302-2.0 into lp:openlp/2.0.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1215302 in OpenLP: "Add .divx to list of video extensions"
  https://bugs.launchpad.net/openlp/+bug/1215302

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-1215302-2.0/+merge/181518

Add the .divx extension to VLC
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-1215302-2.0/+merge/181518
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-1215302-2.0 into lp:openlp/2.0.

=== modified file 'openlp/core/ui/media/vlcplayer.py'
--- openlp/core/ui/media/vlcplayer.py	2012-12-30 19:41:24 +0000
+++ openlp/core/ui/media/vlcplayer.py	2013-08-22 10:55:13 +0000
@@ -89,7 +89,8 @@
     u'*.xa',
     u'*.iso',
     u'*.vob',
-    u'*.webm'
+    u'*.webm',
+    u'*.divx'
 ]
 
 

=== modified file 'openlp/core/ui/media/webkitplayer.py'
--- openlp/core/ui/media/webkitplayer.py	2012-12-30 19:41:24 +0000
+++ openlp/core/ui/media/webkitplayer.py	2013-08-22 10:55:13 +0000
@@ -229,32 +229,32 @@
 """
 
 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'
     ]