KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small adjustement to sending next song

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-11-13 14:39:43 +01:00
parent 8cc9a66948
commit 7b0d3c3232
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/public/assets/js/embed.js
View File

@@ -7,6 +7,7 @@ var player_ready = false;
var list_html = $("#list-song-html").html(); var list_html = $("#list-song-html").html();
var w_p = true; var w_p = true;
var lazy_load = false; var lazy_load = false;
var end_programmatically = false;
var embed = true; var embed = true;
var vol = 100; var vol = 100;
var adminpass = ""; var adminpass = "";

1
server/public/assets/js/listeners.js
View File

@@ -10,6 +10,7 @@ var searching = false;
var time_regex = /P((([0-9]*\.?[0-9]*)Y)?(([0-9]*\.?[0-9]*)M)?(([0-9]*\.?[0-9]*)W)?(([0-9]*\.?[0-9]*)D)?)?(T(([0-9]*\.?[0-9]*)H)?(([0-9]*\.?[0-9]*)M)?(([0-9]*\.?[0-9]*)S)?)?/; var time_regex = /P((([0-9]*\.?[0-9]*)Y)?(([0-9]*\.?[0-9]*)M)?(([0-9]*\.?[0-9]*)W)?(([0-9]*\.?[0-9]*)D)?)?(T(([0-9]*\.?[0-9]*)H)?(([0-9]*\.?[0-9]*)M)?(([0-9]*\.?[0-9]*)S)?)?/;
var conf = []; var conf = [];
var private_channel = false; var private_channel = false;
var end_programmatically = false;
var music = 0; var music = 0;
var timed_remove_check; var timed_remove_check;
var slider_type = "horizontal"; var slider_type = "horizontal";

9
server/public/assets/js/player.js
View File

@@ -244,6 +244,11 @@ var Player = {
} }
break; break;
case YT.PlayerState.PAUSED: case YT.PlayerState.PAUSED:
if(end_programmatically) {
paused = false;
playing = false;
end_programmatically = false;
} else {
if(!chromecastAvailable){ if(!chromecastAvailable){
if(beginning && mobile_beginning) { if(beginning && mobile_beginning) {
$("#playpause").css("visibility", "visible"); $("#playpause").css("visibility", "visible");
@@ -257,6 +262,7 @@ var Player = {
if(window.location.pathname != "/") Playercontrols.play_pause_show(); if(window.location.pathname != "/") Playercontrols.play_pause_show();
mobile_beginning = true; mobile_beginning = true;
} }
}
break; break;
case YT.PlayerState.BUFFERING: case YT.PlayerState.BUFFERING:
break; break;
@@ -639,9 +645,8 @@ var Player = {
} }
if(Player.player.getCurrentTime() > Player.np.end && Player.player.getPlayerState() == YT.PlayerState.PLAYING) { if(Player.player.getCurrentTime() > Player.np.end && Player.player.getPlayerState() == YT.PlayerState.PLAYING) {
end_programmatically = true;
Player.player.pauseVideo(); Player.player.pauseVideo();
playing = false;
paused = false;
if(!offline) { if(!offline) {
socket.emit("end", {id: video_id, channel: chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))}); socket.emit("end", {id: video_id, channel: chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});