changeset 2607:93789e187aae

enhance media support, add mp4 video, mp3 audio, fix wav and webm audio
author RogerHaase <haaserd@gmail.com>
date Wed, 28 May 2014 14:22:24 -0700
parents 600a9b4de684
children cf602d5a0284
files MoinMoin/converter/audio_video_in.py MoinMoin/items/content.py
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/converter/audio_video_in.py	Mon May 26 21:26:41 2014 +0200
+++ b/MoinMoin/converter/audio_video_in.py	Wed May 28 14:22:24 2014 -0700
@@ -41,7 +41,11 @@
 
 from . import default_registry
 from MoinMoin.util.mime import Type, type_moin_document
+default_registry.register(Converter._factory, Type('video/mp4'), type_moin_document)
 default_registry.register(Converter._factory, Type('video/ogg'), type_moin_document)
 default_registry.register(Converter._factory, Type('video/webm'), type_moin_document)
+
+default_registry.register(Converter._factory, Type('audio/mpeg'), type_moin_document)
 default_registry.register(Converter._factory, Type('audio/ogg'), type_moin_document)
-default_registry.register(Converter._factory, Type('audio/wave'), type_moin_document)
+default_registry.register(Converter._factory, Type('audio/webm'), type_moin_document)
+default_registry.register(Converter._factory, Type('audio/x-wav'), type_moin_document)
--- a/MoinMoin/items/content.py	Mon May 26 21:26:41 2014 +0200
+++ b/MoinMoin/items/content.py	Wed May 28 14:22:24 2014 -0700
@@ -585,7 +585,7 @@
 
 @register
 class WAV(Audio):
-    contenttype = 'audio/wave'
+    contenttype = 'audio/x-wav'
     display_name = 'WAV'