tweaked html to remove the up next entry which was incorrect due to new randomization...

diff --git a/atv/assets/admin.html b/atv/assets/admin.html
index 8036324cfc3910bcfcb22d421e0445897950999f..8d1ddfe717962d3771546c2fddd24a822c5499ff 100644 (file)
--- a/atv/assets/admin.html
+++ b/atv/assets/admin.html
@@ -12,11 +12,7 @@
         <table style="width: 100%"><tbody>
             <tr>
               <td><strong>Now Playing</strong></td>
-              <td class="item" id="currVid">Some File</td>
-            </tr>
-            <tr>
-              <td><strong>Playing Next</strong></td>
-              <td class="item" id="nextVid">Some Other File</td>
+              <td class="item" id="currVid">Loading...</td>
             </tr>
         </tbody></table>
     </section>
@@ -32,6 +28,7 @@
             <input type="button" value="Chan +" onclick="javascript:UI.chan_next()"/>
             <input type="button" value="Chan -" onclick="javascript:UI.chan_prev()"/>
             <input type="button" value="Skip" onclick="javascript:UI.skip()"/>
+            <input type="button" value="Enqueue" onclick="javascript:UI.select_file()"/>
         </div>
     </section>
 </article>
@@ -76,7 +73,6 @@
         {
             UI.set_play_state(
                 data["curr"]["path"], // Now Playing
-                data["next"]["path"], // Up next
                 data.playing          // Playing or paused
             );
         }

diff --git a/atv/assets/control.html b/atv/assets/control.html
index 72c103cb238f4c83ae0b46ec0c5d01c40dcf7e5b..b315c8a87d10d972185209a77333a459c0243cd9 100644 (file)
--- a/atv/assets/control.html
+++ b/atv/assets/control.html
@@ -12,11 +12,7 @@
         <table style="width: 100%"><tbody>
             <tr>
               <td><strong>Now Playing</strong></td>
-              <td class="item" id="currVid">Some File</td>
-            </tr>
-            <tr>
-              <td><strong>Playing Next</strong></td>
-              <td class="item" id="nextVid">Some Other File</td>
+              <td class="item" id="currVid">Loading...</td>
             </tr>
         </tbody></table>
         <div style="width: 100%; text-align: center"><h2>Queued Videos</h2></div>
@@ -74,7 +70,6 @@
         {
             UI.set_play_state(
                 data["curr"]["path"], // Now Playing
-                data["next"]["path"], // Up next
                 data.playing          // Playing or paused
             );
         }

diff --git a/atv/assets/index.html b/atv/assets/index.html
index 4e6ba3922710db0de8c14e68ac6f9ed0c885f33b..f6fad0f639475c3a4cb1237bd5e082c41e18e71b 100644 (file)
--- a/atv/assets/index.html
+++ b/atv/assets/index.html
@@ -25,7 +25,7 @@
     <span>APP</span>
 </div>
 
-<div id="ChannelTitle" class="channelBadge">Channel</div>
+<div id="ChannelTitle" class="channelBadge">&nbsp;</div>
 
 <script>
 let current = {};

diff --git a/atv/assets/ui.js b/atv/assets/ui.js
index f8bdc38485c5d78bd427ed8e778c97111e7e6796..2a6effe82fb2bde0749c0e3ca8709af532222681 100644 (file)
--- a/atv/assets/ui.js
+++ b/atv/assets/ui.js
@@ -41,9 +41,8 @@ const UI = (()=>{
         refreshQueue();
     };
 
-    self.set_play_state = (up_now, up_next, playing)=>{
+    self.set_play_state = (up_now, playing)=>{
         currVid.innerText = up_now;
-        nextVid.innerText = up_next;
         if (document.getElementById("playBtn")) {
             playBtn.value = (playing ? "Pause" : "Play");
         }

diff --git a/atv/lib/atv/channel.rb b/atv/lib/atv/channel.rb
index 7b06f25e623da164631f912a3de75496e4b50f45..509a2a96138d11ca5637532d57ae9429aae7de15 100644 (file)
--- a/atv/lib/atv/channel.rb
+++ b/atv/lib/atv/channel.rb
@@ -95,7 +95,6 @@ module ATV
         end
         data
       end
-      pp items
       { "items" => items }
     end