From 92532cb708c7f2790e6432aa29942939eeb38022 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 12 Sep 2012 14:54:11 -0400 Subject: [PATCH] cc-4394: Added m4a --- airtime_mvc/public/js/airtime/library/plupload.js | 10 +++++----- python_apps/media-monitor2/media/monitor/pure.py | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/plupload.js b/airtime_mvc/public/js/airtime/library/plupload.js index cd61be802..28190f3ef 100644 --- a/airtime_mvc/public/js/airtime/library/plupload.js +++ b/airtime_mvc/public/js/airtime/library/plupload.js @@ -3,13 +3,13 @@ $(document).ready(function() { $("#plupload_files").pluploadQueue({ // General settings - runtimes : 'gears, html5, html4', - url : '/Plupload/upload/format/json', - chunk_size: '5mb', - unique_names: 'true', + runtimes : 'gears, html5, html4', + url : '/Plupload/upload/format/json', + chunk_size : '5mb', + unique_names : 'true', multiple_queues : 'true', filters : [ - {title: "Audio Files", extensions: "ogg,mp3,oga,flac,aac,wav"} + {title: "Audio Files", extensions: "ogg,mp3,oga,flac,aac,wav,m4a"} ] }); diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py index 480778ebc..103902001 100644 --- a/python_apps/media-monitor2/media/monitor/pure.py +++ b/python_apps/media-monitor2/media/monitor/pure.py @@ -20,7 +20,9 @@ from configobj import ConfigObj from media.monitor.exceptions import FailedToSetLocale, FailedToCreateDir #supported_extensions = [u"mp3", u"ogg", u"oga"] -supported_extensions = [u"mp3", u"ogg", u"oga", u"flac", u"aac", u"wav"] +supported_extensions = [u"mp3", u"ogg", u"oga", u"flac", u"aac", u"wav", + u'm4a'] + unicode_unknown = u'unknown' path_md = ['MDATA_KEY_TITLE', 'MDATA_KEY_CREATOR', 'MDATA_KEY_SOURCE',