GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

HTML5 video/audio support in attachments

This commit is contained in:
Mikael Nordfeldth 2014-04-14 14:06:11 +02:00
parent da06350a72
commit 90a593718f
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/attachmentlist.php
View File

@ -322,14 +322,6 @@ class Attachment extends AttachmentListItem
break;
case 'application/ogg':
case 'audio/ogg':
case 'audio/x-speex':
case 'video/mpeg':
case 'audio/mpeg':
case 'video/mp4':
case 'video/ogg':
case 'video/quicktime':
case 'video/webm':
$arr = array('type' => $this->attachment->mimetype,
'data' => $this->attachment->url,
'width' => 320,
@ -341,6 +333,24 @@ class Attachment extends AttachmentListItem
$this->out->elementEnd('object');
break;
case 'audio/ogg':
case 'audio/x-speex':
case 'video/mpeg':
case 'audio/mpeg':
case 'video/mp4':
case 'video/ogg':
case 'video/quicktime':
case 'video/webm':
$mediatype = common_get_mime_media($this->attachment->mimetype);
$this->out->elementStart($mediatype,
array('class'=>'attachment_player',
'controls'=>'controls'));
$this->out->element('source',
array('src'=>$this->attachment->url,
'type'=>$this->attachment->mimetype));
$this->out->elementEnd($mediatype);
break;
case 'text/html':
if ($this->attachment->filename) {
// Locally-uploaded HTML. Scrub and display inline.

2
theme/base/css/display.css
View File

@ -832,7 +832,7 @@ float:left;
clear:both;
}
#attachment_view img {
#attachment_view img, #attachment_view .attachment_player {
max-width:480px;
max-height:480px;
}