From f047ae1e1fe255f14cbb2a1efb605fcde7bb1cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Fri, 10 Nov 2017 16:22:51 +0100 Subject: [PATCH] Fixed issue with player not changing song when the song is over defined by the endSeconds --- server/public/assets/js/player.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js index 23929f9e..08786d17 100755 --- a/server/public/assets/js/player.js +++ b/server/public/assets/js/player.js @@ -315,6 +315,7 @@ var Player = { chrome.cast.media.GenericMediaMetadata({metadataType: "GENERIC", title:song_title, image: 'https://img.youtube.com/vi/'+id+'/mqdefault.jpg'}); chrome.cast.Image('https://img.youtube.com/vi/'+id+'/mqdefault.jpg'); } else { + window.player = Player.player; Player.player.loadVideoById({'videoId': id, 'startSeconds': s, 'endSeconds': e}); } }, @@ -636,6 +637,18 @@ var Player = { if(!dragging) { $("#bar").width(per+"%"); } + + if(Player.player.getCurrentTime() > Player.np.end) { + Player.player.pauseVideo(); + playing = false; + paused = false; + + if(!offline) { + socket.emit("end", {id: video_id, channel: chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))}); + } else { + Player.playNext(); + } + } } }catch(e){} if(!Player.stopInterval) {