openlp-core team mailing list archive

[mahfiaz <mahfiaz@xxxxxxxxx>]

mahfiaz has proposed merging lp:~mahfiaz/openlp/extensions into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~mahfiaz/openlp/extensions/+merge/53778

Add .flv and .midi for some XP boxes.
-- 
https://code.launchpad.net/~mahfiaz/openlp/extensions/+merge/53778
Your team OpenLP Core is requested to review the proposed merge of lp:~mahfiaz/openlp/extensions into lp:openlp.

=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py	2011-03-12 09:59:38 +0000
+++ openlp/plugins/media/mediaplugin.py	2011-03-17 10:31:25 +0000
@@ -49,11 +49,13 @@
             u'audio/ac3': [u'.ac3'],
             u'audio/flac': [u'.flac'],
             u'audio/x-m4a': [u'.m4a'],
+            u'audio/midi': [u'.mid', u'.midi'],
             u'audio/x-mp3': [u'.mp3'],
             u'audio/mpeg': [u'.mp3', u'.mp2', u'.mpga', u'.mpega', u'.m4a'],
             u'audio/qcelp': [u'.qcp'],
             u'audio/x-wma': [u'.wma'],
             u'audio/x-ms-wma': [u'.wma'],
+            u'video/x-flv': [u'.flv'],
             u'video/x-matroska': [u'.mpv', u'.mkv'],
             u'video/x-wmv': [u'.wmv'],
             u'video/x-ms-wmv': [u'.wmv']}