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

Trying fixes for skipping on errors

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-01-13 01:24:03 +01:00
parent 36a07f3bc6
commit 5057d4fc05
3 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
static/js/list.js
View File

@@ -126,7 +126,7 @@ var List = {
}, },
skip: function(){ skip: function(){
socket.emit('skip', [chan, adminpass]); socket.emit('skip', {pass: adminpass, id:video_id});
return true; return true;
}, },

30
static/js/youtube.js
View File

@@ -1,9 +1,15 @@
var Youtube = { var Youtube = {
loaded: true,
before_load: "",
after_load: "",
setup_youtube_listener: function(channel) setup_youtube_listener: function(channel)
{ {
socket.on("np", function(obj) socket.on("np", function(obj)
{ {
Youtube.loaded = false;
if(video_id != undefined) Youtube.before_load = ytplayer.getVideoUrl();
if(obj[0].length == 0){ if(obj[0].length == 0){
document.getElementById('song-title').innerHTML = "Empty channel. Add some songs!"; document.getElementById('song-title').innerHTML = "Empty channel. Add some songs!";
@@ -48,6 +54,8 @@ var Youtube = {
ytplayer.playVideo(); ytplayer.playVideo();
if(ytplayer.getDuration() > seekTo || ytplayer.getDuration() == 0) if(ytplayer.getDuration() > seekTo || ytplayer.getDuration() == 0)
ytplayer.seekTo(seekTo); ytplayer.seekTo(seekTo);
Youtube.after_load = video_id;
setTimeout(function(){Youtube.loaded = true;},500);
} }
else else
Youtube.getTitle(song_title, viewers); Youtube.getTitle(song_title, viewers);
@@ -121,8 +129,26 @@ var Youtube = {
{ {
if(newState.data == 5 || newState.data == 100 if(newState.data == 5 || newState.data == 100
|| newState.data == 101 || newState.data == 150) || newState.data == 101 || newState.data == 150)
socket.emit("skip", newState.data); {
else if(video_id !== undefined) /*if(Youtube.count == 2){
Youtube.count = 0;*/
/*console.log("Before: " + Youtube.before_load);
console.log("Now: " + video_id);
console.log("After: " + Youtube.after_load);
console.log(Youtube.before_load == ytplayer.getVideoUrl);*/
curr_playing = ytplayer.getVideoUrl().replace("https://www.youtube.com/watch?v=", "");
if(Youtube.loaded && video_id == curr_playing) {
socket.emit("skip", {error: newState.data, id: video_id, pass: adminpass});
//console.log(video_id, ytplayer.getVideoUrl(), ytplayer.getPlayerState());
}
/*}else{
setTimeout(function(){
ytplayer.loadVideoById(video_id);
Youtube.count ++;
}, Math.floor((Math.random() * 100) + 1));
}*/
}else if(video_id !== undefined)
ytplayer.loadVideoById(video_id); ytplayer.loadVideoById(video_id);
}, },