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

Fixed stuttering issues on leaving and entering channel

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-05-06 13:02:19 +02:00
parent 9f1b882335
commit 192548d26d
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/public/assets/js/channel.js
View File

@@ -137,7 +137,7 @@ var Channel = {
socket = io.connect(''+add+':8080', connection_options);
socket.on('update_required', function(msg) {
if(window.location.hostname == "localhost") {
console.log(msg);
console.error(msg);
return;
}
window.location.reload(true);
@@ -638,6 +638,7 @@ var Channel = {
Player.player.destroy();
} catch(error){}
try {
Player.soundcloud_dead = true;
Player.soundcloud_player.kill();
} catch(error){}
Player.player = "";

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

@@ -7,6 +7,7 @@ var Player = {
stopInterval: false,
fireplace: "",
np: {},
soundcloud_dead: false,
soundcloud_player: {
setVolume: function(val) {}
},
@@ -288,7 +289,7 @@ var Player = {
} catch(e) {
return;
}
if(previousSoundcloud != id) {
if(previousSoundcloud != id || Player.soundcloud_dead) {
previousSoundcloud = id;
if(_autoplay) {
_autoAdd = "true";
@@ -300,6 +301,7 @@ var Player = {
Player.soundcloud_player.bind("pause", Player.soundcloudPause);
Player.soundcloud_player.bind("play", Player.soundcloudPlay);
window.player = player;
Player.soundcloud_dead = false;
SC.get('/tracks', {
ids: id
}).then(function(tracks) {
@@ -321,6 +323,12 @@ var Player = {
try {
Player.soundcloud_player.seek(seekTo * 1000);
} catch(e) {}
try {
if(_autoplay) {
_autoAdd = "true";
Player.soundcloud_player.play();
}
} catch(e) {}
}
soundcloud_loading = true;
if(start == undefined) start = 0;
@@ -330,7 +338,7 @@ var Player = {
try {
Helper.css(document.getElementById("player_overlay"), "background", "url('" + Player.np.thumbnail + "')");
} 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-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.Image('https://img.youtube.com/vi/'+id+'/mqdefault.jpg');
} else {
if(!durationBegun) {
durationBegun = true;
Player.durationSetter();
}
if(videoSource == "soundcloud") {
try {
Player.player.stopVideo();
@@ -401,6 +413,10 @@ var Player = {
if(!embed) {
Suggestions.fetchYoutubeSuggests(id);
}
if(!durationBegun) {
durationBegun = true;
Player.durationSetter();
}
if(videoSource == "soundcloud") {
try {
Player.player.stopVideo();
@@ -656,7 +672,10 @@ var Player = {
soundcloudReady: function() {
beginning = 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) {
@@ -892,9 +911,16 @@ var Player = {
try{
Player.onYouTubeIframeAPIReady();
//SC.Widget(Player.soundcloud_player).bind("ready", Player.soundcloudReady);
} catch(error){
console.error(error);
console.error("Seems YouTube iFrame script isn't correctly loaded. Please reload the page.");
}
try {
Player.soundcloudReady();
} catch(error) {
console.error("Seems YouTube iFrame script isn't correctly loaded. Please reload the page.");
console.error(error);
console.error("Seems SoundCloud script isn't correctly loaded. Please reload the page.");
}
} else {
tag = document.createElement('script');