From dab867d8ee37b6f5d575da253f75ccbd8e06cdee Mon Sep 17 00:00:00 2001
From: dm <dm@arillo.net>
Date: Thu, 21 Jan 2021 21:40:19 +0100
Subject: [PATCH 1/2] fix video playable after upload/convert

---
 public/javascripts/spacedeck_directives.js | 5 ++++-
 views/partials/space.html                  | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/javascripts/spacedeck_directives.js b/public/javascripts/spacedeck_directives.js
index 74acae04..38b69791 100644
--- a/public/javascripts/spacedeck_directives.js
+++ b/public/javascripts/spacedeck_directives.js
@@ -52,7 +52,10 @@ function setup_directives() {
       }
 
       var play_func = function() {
-        video.play();
+        const video_promise = video.play();
+        video_promise.then(function(){
+          video.play();
+        });
         player_state = "playing";
         update_view();
       }
diff --git a/views/partials/space.html b/views/partials/space.html
index 02cd2b60..e6d80e83 100644
--- a/views/partials/space.html
+++ b/views/partials/space.html
@@ -153,9 +153,10 @@
         <!-- video -->
         <div v-if="a.view.major_type == 'video'" v-videoplayer="a" class="video" v-bind:style="a.view.inner_style + ';background-image: url('+a.view.thumbnail_uri+');'">
           <video preload="metadata" v-bind:poster="a.view.thumbnail_uri">
-            <source v-for="rep in a.payload_alternatives" v-bind:src="rep.payload_uri" v-bind:type="rep.mime" />
-            <source v-if="a.payload_uri && a.mime" v-bind:src="a.payload_uri" v-bind:type="a.mime" />
+            <source v-for="rep in a.view.payload_alternatives" v-bind:src="rep.payload_uri" v-bind:type="rep.mime" />
+            <source v-if="a.view.payload_uri && a.mime" v-bind:src="a.view.payload_uri" v-bind:type="a.view.mime" />
           </video>
+          
 
           <div class="tl-controls">
             <div class="btn btn-md btn-toggle btn-round" v-bind:class="{alt:a.player_view.state=='playing'}">

From 9142529ed6961622d0f37aac1d1ca8fdfee8cc2b Mon Sep 17 00:00:00 2001
From: dm <dm@arillo.net>
Date: Thu, 21 Jan 2021 23:03:14 +0100
Subject: [PATCH 2/2] proper syntax

---
 public/javascripts/spacedeck_directives.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/public/javascripts/spacedeck_directives.js b/public/javascripts/spacedeck_directives.js
index 38b69791..e1baa9e4 100644
--- a/public/javascripts/spacedeck_directives.js
+++ b/public/javascripts/spacedeck_directives.js
@@ -53,11 +53,17 @@ function setup_directives() {
 
       var play_func = function() {
         const video_promise = video.play();
-        video_promise.then(function(){
-          video.play();
-        });
-        player_state = "playing";
-        update_view();
+        if (video_promise !== undefined) {
+          video_promise.then(_ => {
+            // Automatic playback started!
+            player_state = "playing";
+            update_view();
+          })
+          .catch(error => {
+            // Auto-play was prevented
+            // Show paused UI.
+          });
+        }
       }
 
       var pause_func = function() {