heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/pythonsnake/629_autoplay'

Browse Source
This commit is contained in:
Christopher Allan Webber 2013-02-24 13:06:53 -06:00
commit a587492729
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/config_spec.ini
View File

@ -100,6 +100,9 @@ vp8_quality = integer(default=8)
# Range: -0.1..1 # Range: -0.1..1
vorbis_quality = float(default=0.3) vorbis_quality = float(default=0.3)
# Autoplay the video when page is loaded?
auto_play = boolean(default=True)
[media_type:mediagoblin.media_types.audio] [media_type:mediagoblin.media_types.audio]
keep_original = boolean(default=True) keep_original = boolean(default=True)

4
mediagoblin/templates/mediagoblin/media_displays/video.html
View File

@ -27,7 +27,9 @@
{%- endblock %} {%- endblock %}
{% block mediagoblin_media %} {% block mediagoblin_media %}
<video controls autoplay preload="auto" class="video-js vjs-mg-skin" <video controls
{% if global_config['media_type:mediagoblin.media_types.video']['auto_play'] %}autoplay{% endif %}
preload="auto" class="video-js vjs-mg-skin"
data-setup='{"height": {{ media.media_data.height }}, data-setup='{"height": {{ media.media_data.height }},
"width": {{ media.media_data.width }} }'> "width": {{ media.media_data.width }} }'>
<source src="{{ request.app.public_store.file_url( <source src="{{ request.app.public_store.file_url(