openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/add-ogv into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/add-ogv/+merge/123428

Reformatted the list of extensions, and added *.ogv (which is actually usually used for libtheora videos in the OGG container format)
-- 
https://code.launchpad.net/~raoul-snyman/openlp/add-ogv/+merge/123428
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/add-ogv into lp:openlp.

=== modified file 'openlp/core/ui/media/vlcplayer.py'
--- openlp/core/ui/media/vlcplayer.py	2012-08-05 18:17:52 +0000
+++ openlp/core/ui/media/vlcplayer.py	2012-09-08 17:42:20 +0000
@@ -63,37 +63,32 @@
         VLC_AVAILABLE = False
         log.debug(u'VLC could not be loaded: %s' % version)
 
-AUDIO_EXT = [
-    u'*.mp3'
-    , u'*.wav'
-    , u'*.wma'
-    , u'*.ogg'
-    ]
+AUDIO_EXT = [u'*.mp3', u'*.wav', u'*.wma', u'*.ogg']
 
 VIDEO_EXT = [
-    u'*.3gp'
-    , u'*.asf', u'*.wmv'
-    , u'*.au'
-    , u'*.avi'
-    , u'*.flv'
-    , u'*.mov'
-    , u'*.mp4'
-    , u'*.ogm'
-    , u'*.mkv', u'*.mka'
-    , u'*.ts', u'*.mpg'
-    , u'*.mpg', u'*.mp2'
-    , u'*.nsc'
-    , u'*.nsv'
-    , u'*.nut'
-    , u'*.ra', u'*.ram', u'*.rm', u'*.rv' ,u'*.rmbv'
-    , u'*.a52', u'*.dts', u'*.aac', u'*.flac' ,u'*.dv', u'*.vid'
-    , u'*.tta', u'*.tac'
-    , u'*.ty'
-    , u'*.dts'
-    , u'*.xa'
-    , u'*.iso'
-    , u'*.vob'
-    ]
+    u'*.3gp',
+    u'*.asf', u'*.wmv',
+    u'*.au',
+    u'*.avi',
+    u'*.flv',
+    u'*.mov',
+    u'*.mp4',
+    u'*.ogm', u'*.ogv',
+    u'*.mkv', u'*.mka',
+    u'*.ts', u'*.mpg',
+    u'*.mpg', u'*.mp2',
+    u'*.nsc',
+    u'*.nsv',
+    u'*.nut',
+    u'*.ra', u'*.ram', u'*.rm', u'*.rv' ,u'*.rmbv',
+    u'*.a52', u'*.dts', u'*.aac', u'*.flac' ,u'*.dv', u'*.vid',
+    u'*.tta', u'*.tac',
+    u'*.ty',
+    u'*.dts',
+    u'*.xa',
+    u'*.iso',
+    u'*.vob'
+]
 
 
 class VlcPlayer(MediaPlayer):