aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/config_spec.ini3
-rw-r--r--mediagoblin/templates/mediagoblin/media_displays/video.html4
2 files changed, 6 insertions, 1 deletions
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index 91bca8df..a9b0927b 100644
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -100,6 +100,9 @@ vp8_quality = integer(default=8)
# Range: -0.1..1
vorbis_quality = float(default=0.3)
+# Autoplay the video when page is loaded?
+auto_play = boolean(default=True)
+
[media_type:mediagoblin.media_types.audio]
keep_original = boolean(default=True)
diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html
index 7d5ede8d..9eeb7c85 100644
--- a/mediagoblin/templates/mediagoblin/media_displays/video.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/video.html
@@ -27,7 +27,9 @@
{%- endblock %}
{% 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 }},
"width": {{ media.media_data.width }} }'>
<source src="{{ request.app.public_store.file_url(