Commit bc07f998 authored by Son Nguyen's avatar Son Nguyen Committed by Aaron Wells

Enable OGG media. Bug 1540654

TODO: Currently a DB constraint on our mimetypes table
prevents us from having two file suffixes mapped to the
same mimetype, which means we can either support .ogg
or .oga files, but not both. Since .oga files are already
in our table, I'm going with that for now.

behatnotneeded

Change-Id: Ie364b111f7b4dc956712b179fefca6e76b23d5e9
parent 3603d59b
......@@ -282,6 +282,8 @@ class PluginBlocktypeInternalmedia extends MaharaCoreBlocktype {
'mpeg' => 'qt',
'avi' => 'wmp',
'mp4_video' => 'html5video',
'oga' => 'html5audio',
'ogv' => 'html5video',
/* commenting out for now
'ram' => 'real_player',
'rm' => 'real_player',
......
......@@ -228,6 +228,8 @@ $string['ods'] = 'OpenOffice / LibreOffice Spreadsheet file';
$string['odt'] = 'OpenOffice / LibreOffice Writer document';
$string['oth'] = 'OpenOffice / LibreOffice web document';
$string['ott'] = 'OpenOffice / LibreOffice template document';
$string['oga'] = 'OGA audio file';
$string['ogv'] = 'OGV video file';
$string['pdf'] = 'PDF document';
$string['png'] = 'PNG image';
$string['ppt'] = 'MS PowerPoint document';
......
......@@ -2796,6 +2796,7 @@ class ArtefactTypeVideo extends ArtefactTypeFile {
'sgi_movie' => 'sgi_movie',
'mp4_video' => 'mp4_video',
'asf' => 'wmv',
'ogv' => 'ogv',
);
}
return $descriptions;
......@@ -2851,6 +2852,7 @@ class ArtefactTypeAudio extends ArtefactTypeFile {
'aiff',
'm3u',
'asf',
'oga',
);
}
return $descriptions;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment