OpenLP

Merge lp:~raoul-snyman/openlp/bug-1215302-2.0 into lp:openlp/2.0

  1. bug-1215302-2.0
  2. Merge into release-2.0
Proposed by Raoul Snyman
Status: Merged
Approved by: Andreas Preikschat
Approved revision: 2165
Merged at revision: 2165
Proposed branch: lp:~raoul-snyman/openlp/bug-1215302-2.0
Merge into: lp:openlp/2.0
Diff against target: 71 lines (+25/-24)
2 files modified
openlp/core/ui/media/vlcplayer.py (+2/-1)
openlp/core/ui/media/webkitplayer.py (+23/-23)
To merge this branch: bzr merge lp:~raoul-snyman/openlp/bug-1215302-2.0
Reviewer Review Type Date Requested Status
Andreas Preikschat (community) Approve
Tim Bentley Approve
Review via email: mp+181518@code.launchpad.net

Description of the change

Add the .divx extension to VLC

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Looks good

review: Approve
Revision history for this message
Andreas Preikschat (googol-deactivatedaccount) wrote :

Approved, but next time please no refactorings!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/ui/media/vlcplayer.py'
2--- openlp/core/ui/media/vlcplayer.py 2012-12-30 19:41:24 +0000
3+++ openlp/core/ui/media/vlcplayer.py 2013-08-22 10:55:13 +0000
4@@ -89,7 +89,8 @@
5 u'*.xa',
6 u'*.iso',
7 u'*.vob',
8- u'*.webm'
9+ u'*.webm',
10+ u'*.divx'
11 ]
12
13
14
15=== modified file 'openlp/core/ui/media/webkitplayer.py'
16--- openlp/core/ui/media/webkitplayer.py 2012-12-30 19:41:24 +0000
17+++ openlp/core/ui/media/webkitplayer.py 2013-08-22 10:55:13 +0000
18@@ -229,32 +229,32 @@
19 """
20
21 VIDEO_EXT = [
22- u'*.3gp'
23- , u'*.3gpp'
24- , u'*.3g2'
25- , u'*.3gpp2'
26- , u'*.aac'
27- , u'*.flv'
28- , u'*.f4a'
29- , u'*.f4b'
30- , u'*.f4p'
31- , u'*.f4v'
32- , u'*.mov'
33- , u'*.m4a'
34- , u'*.m4b'
35- , u'*.m4p'
36- , u'*.m4v'
37- , u'*.mkv'
38- , u'*.mp4'
39- , u'*.ogv'
40- , u'*.webm'
41- , u'*.mpg', u'*.wmv', u'*.mpeg', u'*.avi'
42- , u'*.swf'
43+ u'*.3gp',
44+ u'*.3gpp',
45+ u'*.3g2',
46+ u'*.3gpp2',
47+ u'*.aac',
48+ u'*.flv',
49+ u'*.f4a',
50+ u'*.f4b',
51+ u'*.f4p',
52+ u'*.f4v',
53+ u'*.mov',
54+ u'*.m4a',
55+ u'*.m4b',
56+ u'*.m4p',
57+ u'*.m4v',
58+ u'*.mkv',
59+ u'*.mp4',
60+ u'*.ogv',
61+ u'*.webm',
62+ u'*.mpg', u'*.wmv', u'*.mpeg', u'*.avi',
63+ u'*.swf'
64 ]
65
66 AUDIO_EXT = [
67- u'*.mp3'
68- , u'*.ogg'
69+ u'*.mp3',
70+ u'*.ogg'
71 ]
72
73

Subscribers

People subscribed via source and target branches