mirror of
https://github.com/KevinMidboe/zoff.git
synced 2025-10-29 18:00:23 +00:00
Fixed stuttering issues on leaving and entering channel
This commit is contained in:
@@ -137,7 +137,7 @@ var Channel = {
|
|||||||
socket = io.connect(''+add+':8080', connection_options);
|
socket = io.connect(''+add+':8080', connection_options);
|
||||||
socket.on('update_required', function(msg) {
|
socket.on('update_required', function(msg) {
|
||||||
if(window.location.hostname == "localhost") {
|
if(window.location.hostname == "localhost") {
|
||||||
console.log(msg);
|
console.error(msg);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
window.location.reload(true);
|
window.location.reload(true);
|
||||||
@@ -638,6 +638,7 @@ var Channel = {
|
|||||||
Player.player.destroy();
|
Player.player.destroy();
|
||||||
} catch(error){}
|
} catch(error){}
|
||||||
try {
|
try {
|
||||||
|
Player.soundcloud_dead = true;
|
||||||
Player.soundcloud_player.kill();
|
Player.soundcloud_player.kill();
|
||||||
} catch(error){}
|
} catch(error){}
|
||||||
Player.player = "";
|
Player.player = "";
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ var Player = {
|
|||||||
stopInterval: false,
|
stopInterval: false,
|
||||||
fireplace: "",
|
fireplace: "",
|
||||||
np: {},
|
np: {},
|
||||||
|
soundcloud_dead: false,
|
||||||
soundcloud_player: {
|
soundcloud_player: {
|
||||||
setVolume: function(val) {}
|
setVolume: function(val) {}
|
||||||
},
|
},
|
||||||
@@ -288,7 +289,7 @@ var Player = {
|
|||||||
} catch(e) {
|
} catch(e) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if(previousSoundcloud != id) {
|
if(previousSoundcloud != id || Player.soundcloud_dead) {
|
||||||
previousSoundcloud = id;
|
previousSoundcloud = id;
|
||||||
if(_autoplay) {
|
if(_autoplay) {
|
||||||
_autoAdd = "true";
|
_autoAdd = "true";
|
||||||
@@ -300,6 +301,7 @@ var Player = {
|
|||||||
Player.soundcloud_player.bind("pause", Player.soundcloudPause);
|
Player.soundcloud_player.bind("pause", Player.soundcloudPause);
|
||||||
Player.soundcloud_player.bind("play", Player.soundcloudPlay);
|
Player.soundcloud_player.bind("play", Player.soundcloudPlay);
|
||||||
window.player = player;
|
window.player = player;
|
||||||
|
Player.soundcloud_dead = false;
|
||||||
SC.get('/tracks', {
|
SC.get('/tracks', {
|
||||||
ids: id
|
ids: id
|
||||||
}).then(function(tracks) {
|
}).then(function(tracks) {
|
||||||
@@ -321,6 +323,12 @@ var Player = {
|
|||||||
try {
|
try {
|
||||||
Player.soundcloud_player.seek(seekTo * 1000);
|
Player.soundcloud_player.seek(seekTo * 1000);
|
||||||
} catch(e) {}
|
} catch(e) {}
|
||||||
|
try {
|
||||||
|
if(_autoplay) {
|
||||||
|
_autoAdd = "true";
|
||||||
|
Player.soundcloud_player.play();
|
||||||
|
}
|
||||||
|
} catch(e) {}
|
||||||
}
|
}
|
||||||
soundcloud_loading = true;
|
soundcloud_loading = true;
|
||||||
if(start == undefined) start = 0;
|
if(start == undefined) start = 0;
|
||||||
@@ -330,7 +338,7 @@ var Player = {
|
|||||||
try {
|
try {
|
||||||
Helper.css(document.getElementById("player_overlay"), "background", "url('" + Player.np.thumbnail + "')");
|
Helper.css(document.getElementById("player_overlay"), "background", "url('" + Player.np.thumbnail + "')");
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
console.log("Woops this seems to be the first song in the channel. This will be fixed.. soon.. we think..");
|
console.error("Woops this seems to be the first song in the channel. This will be fixed.. soon.. we think..");
|
||||||
}
|
}
|
||||||
Helper.css(document.getElementById("player_overlay"), "background-size", "auto");
|
Helper.css(document.getElementById("player_overlay"), "background-size", "auto");
|
||||||
Helper.css(document.getElementById("player_overlay"), "background-position", "20%");
|
Helper.css(document.getElementById("player_overlay"), "background-position", "20%");
|
||||||
@@ -354,6 +362,10 @@ var Player = {
|
|||||||
chrome.cast.media.GenericMediaMetadata({metadataType: 0, title:song_title, image: 'https://img.youtube.com/vi/'+id+'/mqdefault.jpg', images: ['https://img.youtube.com/vi/'+id+'/mqdefault.jpg']});
|
chrome.cast.media.GenericMediaMetadata({metadataType: 0, title:song_title, image: 'https://img.youtube.com/vi/'+id+'/mqdefault.jpg', images: ['https://img.youtube.com/vi/'+id+'/mqdefault.jpg']});
|
||||||
chrome.cast.Image('https://img.youtube.com/vi/'+id+'/mqdefault.jpg');
|
chrome.cast.Image('https://img.youtube.com/vi/'+id+'/mqdefault.jpg');
|
||||||
} else {
|
} else {
|
||||||
|
if(!durationBegun) {
|
||||||
|
durationBegun = true;
|
||||||
|
Player.durationSetter();
|
||||||
|
}
|
||||||
if(videoSource == "soundcloud") {
|
if(videoSource == "soundcloud") {
|
||||||
try {
|
try {
|
||||||
Player.player.stopVideo();
|
Player.player.stopVideo();
|
||||||
@@ -401,6 +413,10 @@ var Player = {
|
|||||||
if(!embed) {
|
if(!embed) {
|
||||||
Suggestions.fetchYoutubeSuggests(id);
|
Suggestions.fetchYoutubeSuggests(id);
|
||||||
}
|
}
|
||||||
|
if(!durationBegun) {
|
||||||
|
durationBegun = true;
|
||||||
|
Player.durationSetter();
|
||||||
|
}
|
||||||
if(videoSource == "soundcloud") {
|
if(videoSource == "soundcloud") {
|
||||||
try {
|
try {
|
||||||
Player.player.stopVideo();
|
Player.player.stopVideo();
|
||||||
@@ -656,7 +672,10 @@ var Player = {
|
|||||||
soundcloudReady: function() {
|
soundcloudReady: function() {
|
||||||
beginning = true;
|
beginning = true;
|
||||||
player_ready = true;
|
player_ready = true;
|
||||||
if(videoSource == "soundcloud" && videoId != undefined) Player.loadVideoById(videoId, Player.np.duration, Player.np.start, Player.np.end);
|
if(!durationBegun) {
|
||||||
|
Player.durationSetter();
|
||||||
|
}
|
||||||
|
if(videoSource == "soundcloud" && video_id != undefined) Player.loadVideoById(video_id, Player.np.duration, Player.np.start, Player.np.end);
|
||||||
},
|
},
|
||||||
|
|
||||||
onPlayerReady: function(event) {
|
onPlayerReady: function(event) {
|
||||||
@@ -892,10 +911,17 @@ var Player = {
|
|||||||
try{
|
try{
|
||||||
Player.onYouTubeIframeAPIReady();
|
Player.onYouTubeIframeAPIReady();
|
||||||
//SC.Widget(Player.soundcloud_player).bind("ready", Player.soundcloudReady);
|
//SC.Widget(Player.soundcloud_player).bind("ready", Player.soundcloudReady);
|
||||||
Player.soundcloudReady();
|
|
||||||
} catch(error){
|
} catch(error){
|
||||||
|
console.error(error);
|
||||||
console.error("Seems YouTube iFrame script isn't correctly loaded. Please reload the page.");
|
console.error("Seems YouTube iFrame script isn't correctly loaded. Please reload the page.");
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
|
Player.soundcloudReady();
|
||||||
|
} catch(error) {
|
||||||
|
console.error(error);
|
||||||
|
console.error("Seems SoundCloud script isn't correctly loaded. Please reload the page.");
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
tag = document.createElement('script');
|
tag = document.createElement('script');
|
||||||
tag.src = "https://www.youtube.com/iframe_api";
|
tag.src = "https://www.youtube.com/iframe_api";
|
||||||
|
|||||||
Reference in New Issue
Block a user