openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/vlc-fixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~trb143/openlp/vlc-fixes/+merge/118272

WMA works for VLC so lets allow it
-- 
https://code.launchpad.net/~trb143/openlp/vlc-fixes/+merge/118272
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/vlc-fixes into lp:openlp.

=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py	2012-06-22 14:14:53 +0000
+++ openlp/core/ui/media/mediacontroller.py	2012-08-05 20:00:33 +0000
@@ -43,7 +43,7 @@
 class MediaController(object):
     """
     The implementation of the Media Controller. The Media Controller adds an own
-    class for every Player. Currently these are QtWebkit, Phonon and planed Vlc.
+    class for every Player. Currently these are QtWebkit, Phonon and Vlc.
     """
 
     def __init__(self, parent):

=== modified file 'openlp/core/ui/media/vlcplayer.py'
--- openlp/core/ui/media/vlcplayer.py	2012-06-22 14:14:53 +0000
+++ openlp/core/ui/media/vlcplayer.py	2012-08-05 20:00:33 +0000
@@ -66,6 +66,7 @@
 AUDIO_EXT = [
     u'*.mp3'
     , u'*.wav'
+    , u'*.wma'
     , u'*.ogg'
     ]