aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
diff options
context:
space:
mode:
authorJoar Wandborg <git@wandborg.com>2012-02-14 23:26:07 +0100
committerJoar Wandborg <git@wandborg.com>2012-02-14 23:26:07 +0100
commit5a34a80d0a9d8a930d2a8c49f48d3fe08b60a237 (patch)
tree4e7d27a9d2080d3f89c507960806107caf1c9bc4 /mediagoblin/templates
parent6e03e586718ad06da38e3f82a043e35643bb9764 (diff)
downloadmediagoblin-5a34a80d0a9d8a930d2a8c49f48d3fe08b60a237.tar.lz
mediagoblin-5a34a80d0a9d8a930d2a8c49f48d3fe08b60a237.tar.xz
mediagoblin-5a34a80d0a9d8a930d2a8c49f48d3fe08b60a237.zip
Audio media handler, media sniffing, video fixes
* Added audio processing code * Added audio display template * Added audio configuration setting * Changed video docstring
Diffstat (limited to 'mediagoblin/templates')
-rw-r--r--mediagoblin/templates/mediagoblin/media_displays/audio.html47
1 files changed, 47 insertions, 0 deletions
diff --git a/mediagoblin/templates/mediagoblin/media_displays/audio.html b/mediagoblin/templates/mediagoblin/media_displays/audio.html
new file mode 100644
index 00000000..802a85c1
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/media_displays/audio.html
@@ -0,0 +1,47 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#}
+
+{% extends 'mediagoblin/user_pages/media.html' %}
+
+{% block mediagoblin_media %}
+ <div class="audio-media">
+ <audio controls="controls"
+ preload="metadata">
+ <source src="{{ request.app.public_store.file_url(
+ media.media_files.ogg) }}" type="video/webm; encoding=&quot;vorbis&quot;" />
+ <div class="no_html5">
+ {%- trans -%}Sorry, this audio will not work because
+ your web browser does not support HTML5
+ audio.{%- endtrans -%}<br/>
+ {%- trans -%}You can get a modern web browser that
+ can play the audio at <a href="http://getfirefox.com">
+ http://getfirefox.com</a>!{%- endtrans -%}
+ </div>
+ </audio>
+ </div>
+ {% if 'original' in media.media_files %}
+ <p>
+ <a href="{{ request.app.public_store.file_url(
+ media.media_files['original']) }}">
+ {%- trans -%}
+ Original
+ {%- endtrans -%}
+ </a>
+ </p>
+ {% endif %}
+{% endblock %}