From d89ccc4d50156dbf63cb467ab9b782edf4a816f2 Mon Sep 17 00:00:00 2001
From: Omar Roth <omarroth@hotmail.com>
Date: Fri, 8 Jun 2018 14:38:59 -0500
Subject: [PATCH] Unify video/audio player

---
 src/views/player/audio.ecr |  5 -----
 src/views/player/video.ecr |  5 -----
 src/views/watch.ecr        | 16 +++++++++++-----
 3 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 src/views/player/audio.ecr
 delete mode 100644 src/views/player/video.ecr

diff --git a/src/views/player/audio.ecr b/src/views/player/audio.ecr
deleted file mode 100644
index 2130988d..00000000
--- a/src/views/player/audio.ecr
+++ /dev/null
@@ -1,5 +0,0 @@
-<audio style="width:100%" poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>" id="player" class="video-js vjs-16-9" data-setup="{}" controls>
-    <% audio_streams.each_with_index do |fmt, i| %>
-        <source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["bitrate"] %>k" selected="<%= i == 0 ? true : false %>">
-    <% end %>
-</audio>
\ No newline at end of file
diff --git a/src/views/player/video.ecr b/src/views/player/video.ecr
deleted file mode 100644
index 6e1ff5eb..00000000
--- a/src/views/player/video.ecr
+++ /dev/null
@@ -1,5 +0,0 @@
-<video style="width:100%" playsinline poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>" id="player" class="video-js vjs-16-9" data-setup="{}" controls>
-    <% fmt_stream.each_with_index do |fmt, i| %>
-        <source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= i == 0 ? true : false %>">
-    <% end %>
-</video>
\ No newline at end of file
diff --git a/src/views/watch.ecr b/src/views/watch.ecr
index 4545b697..dc8e4258 100644
--- a/src/views/watch.ecr
+++ b/src/views/watch.ecr
@@ -10,11 +10,17 @@
 <% end %>
 
 <div class="h-box">
-    <% if listen %>
-    <%= render "src/views/player/audio.ecr" %>
-    <% else %>
-    <%= render "src/views/player/video.ecr" %>
-    <% end %>
+    <video style="width:100%" playsinline poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>" id="player" class="video-js vjs-16-9" data-setup="{}" controls>
+        <% if listen %>
+            <% audio_streams.each_with_index do |fmt, i| %>
+                <source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["bitrate"] %>k" selected="<%= i == 0 ? true : false %>">
+            <% end %>
+        <% else %>
+            <% fmt_stream.each_with_index do |fmt, i| %>
+                <source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= i == 0 ? true : false %>">
+            <% end %>    
+        <% end %>
+    </video>
 </div>
 
 <script>