From 28e822fbb1045adddaaeb73b5fdd5587a67a0ad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Fri, 10 Nov 2017 11:49:18 +0100
Subject: [PATCH] Fixed start and end not being sent on add

---
 server/handlers/list_change.js    |  2 +-
 server/public/assets/js/player.js | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js
index 00ac1194..73176516 100644
--- a/server/handlers/list_change.js
+++ b/server/handlers/list_change.js
@@ -91,7 +91,7 @@ function add_function(arr, coll, guid, offline, socket) {
                                             Frontpage.update_frontpage(coll, id, title);
                                             if(!full_list) Search.get_correct_info(new_song, coll, false);
                                         } else {
-                                            var new_song = {"_id": "asd", "added":added,"guids":guids,"id":id,"now_playing":np,"title":title,"votes":votes, "duration":duration};
+                                            var new_song = {"_id": "asd", "added":added,"guids":guids,"id":id,"now_playing":np,"title":title,"votes":votes, "duration":duration, "start": start, "end": end};
                                             io.to(coll).emit("channel", {type: "added", value: new_song});
                                             if(!full_list) Search.get_correct_info(new_song, coll, true);
                                         }
diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js
index 7244cd4a..23929f9e 100755
--- a/server/public/assets/js/player.js
+++ b/server/public/assets/js/player.js
@@ -339,6 +339,7 @@ var Player = {
 
     playNext: function(){
         var next_song = full_playlist[0];
+
         video_id   = next_song.id;
         time       = (new Date()).getTime();
         song_title = next_song.title;
@@ -349,6 +350,14 @@ var Player = {
         else start = 0;
         if(next_song.hasOwnProperty("end")) end = next_song.end;
         else end = duration;
+
+        Player.np = {
+            id: video_id,
+            start: start,
+            end: end,
+            duration: duration,
+        };
+
         Player.getTitle(song_title, viewers);
         Player.setBGimage(video_id);
         if(chromecastAvailable){
@@ -377,6 +386,14 @@ var Player = {
         else start = 0;
         if(next_song.hasOwnProperty("end")) end = next_song.end;
         else end = duration;
+
+        Player.np = {
+            id: video_id,
+            start: start,
+            end: end,
+            duration: duration,
+        };
+
         Player.getTitle(song_title, viewers);
         Player.setBGimage(video_id);
 
@@ -591,10 +608,11 @@ var Player = {
                 if(!Player.stopInterval) {
                     durationBegun = true;
                 }
+
                 dMinutes = Math.floor(duration / 60);
                 dSeconds = duration - dMinutes * 60;
                 currDurr = Player.player.getCurrentTime() !== undefined ? Math.floor(Player.player.getCurrentTime()) : seekTo;
-                if(currDurr - Player.np.start > duration) {
+                if(currDurr - Player.np.start > duration && !offline) {
                     currDurr = duration - Player.np.start;
                 }
                 currDurr = currDurr - Player.np.start;