From 139ae217ddf64d9433c3159dbfb819f577f2c5b7 Mon Sep 17 00:00:00 2001
From: tuj <tujensen@gmail.com>
Date: Sun, 22 Mar 2020 15:35:59 +0100
Subject: [PATCH] Feature: Configurable video formats (#26)

* Changed from a fixed number of video formats to depending on formats supplied.
---
 .../slides/only-video/only-video-edit.html                 | 7 ++-----
 .../default_templates/slides/only-video/only-video.html    | 6 ++----
 Resources/public/templates/js/videoSlide.js                | 6 +-----
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Resources/public/templates/default_templates/slides/only-video/only-video-edit.html b/Resources/public/templates/default_templates/slides/only-video/only-video-edit.html
index 8188d1e..e223119 100644
--- a/Resources/public/templates/default_templates/slides/only-video/only-video-edit.html
+++ b/Resources/public/templates/default_templates/slides/only-video/only-video-edit.html
@@ -1,9 +1,6 @@
 <div class="only-video" data-ng-style="{'width': theStyle.width, 'height': theStyle.height}">
-  <div data-ng-if="ikSlide.media.length > 0 && ikSlide.media[0].provider_status === 3">Videoen er endnu ikke klar.</div>
-  <video data-ng-if="ikSlide.media.length > 0 && ikSlide.media[0].provider_status === 1" class="only-video--video-player" controls id="videoPlayer">
-    <source data-ng-src="{{ikSlide.currentVideo.webm}}" type="video/webm">
-    <source data-ng-src="{{ikSlide.currentVideo.ogg}}" type="video/ogg">
-    <source data-ng-src="{{ikSlide.currentVideo.mp4}}" type="video/mp4">
+  <video data-ng-if="ikSlide.media.length > 0 && ikSlide.media[0].provider_metadata[0].reference" class="only-video--video-player" controls id="videoPlayer">
+    <source data-ng-src="{{mediaEntry.reference}}" type="video/{{mediaEntry.format}}" data-ng-repeat="mediaEntry in ikSlide.media[0].provider_metadata">
   </video>
 
   <img class="only-video--logo" data-ng-show="ikSlide.currentLogo" data-ng-style="{'top':ikSlide.options.logopos.top, 'bottom':ikSlide.options.logopos.bottom, 'left':ikSlide.options.logopos.left, 'right':ikSlide.options.logopos.right, 'width': ikSlide.options.logosize}" data-ng-src="{{ikSlide.currentLogo}}" />
diff --git a/Resources/public/templates/default_templates/slides/only-video/only-video.html b/Resources/public/templates/default_templates/slides/only-video/only-video.html
index 2b054b4..645585c 100644
--- a/Resources/public/templates/default_templates/slides/only-video/only-video.html
+++ b/Resources/public/templates/default_templates/slides/only-video/only-video.html
@@ -1,9 +1,7 @@
 <div class="only-video">
   <video id="videoPlayer-{{ikSlide.uniqueId}}" class="only-video--video-player" poster="/bundles/os2displaydefaulttemplate/assets/images/black.png">
-    <source data-src="{{ikSlide.currentVideo.webm}}" type="video/webm">
-    <source data-src="{{ikSlide.currentVideo.ogg}}" type="video/ogg">
-    <source data-src="{{ikSlide.currentVideo.mp4}}" type="video/mp4">
-      Your browser does not support the <code>video</code> element.
+    <source data-src="{{src}}" type="video/{{key}}" data-ng-repeat="(key,src) in ikSlide.currentVideo" />
+    Your browser does not support the <code>video</code> element.
   </video>
 
   <img class="only-video--logo" data-ng-show="ikSlide.currentLogo" data-ng-style="{'top':ikSlide.options.logopos.top, 'bottom':ikSlide.options.logopos.bottom, 'left':ikSlide.options.logopos.left, 'right':ikSlide.options.logopos.right, 'width': ikSlide.options.logosize}" data-ng-src="{{ikSlide.currentLogo}}" />
diff --git a/Resources/public/templates/js/videoSlide.js b/Resources/public/templates/js/videoSlide.js
index cc7d08f..16fdd9b 100644
--- a/Resources/public/templates/js/videoSlide.js
+++ b/Resources/public/templates/js/videoSlide.js
@@ -15,11 +15,7 @@ if (!window.slideFunctions['video']) {
 
       if (slide.media_type === 'video' && slide.media.length > 0) {
         // Set current video variable to path to video files.
-        slide.currentVideo = {
-          "mp4": slide.media[0].mp4,
-          "ogg": slide.media[0].ogv,
-          "webm": slide.media[0].webm
-        };
+        slide.currentVideo = slide.media[0];
       }
     },