KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-08 20:48:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Paused, embed and includes

Browse Source 
- Fixed issue with paused video playing on changing song for others
- Fixed more embedoptions
- cueVideoById is a neat function that I should have used earlier
- Added smaller jquery.ui files
This commit is contained in:
Kasper Rynning-Tønnesen
2018-03-04 20:56:41 +01:00
parent 57c64d8e29
commit bdf014b4ff
5 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,8 +44,10 @@ var Player = {
startTime = time - conf.startTime;
song_title = obj.np[0].title;
duration = obj.np[0].duration;
Player.loadVideoById(video_id, duration);
Player.stopVideo();
if(player_ready) {
Player.cueVideoById(video_id, duration);
Player.stopVideo();
}
return;
}
if(embed && obj.np) {
@@ -76,9 +78,7 @@ var Player = {
"mobile_beginning variable: " + mobile_beginning]);
try{
Helper.log(["getVideoUrl(): " + Player.player.getVideoUrl().split('v=')[1]]);
} catch(e){
}
} catch(e){}
Helper.log(["video_id variable: " + video_id]);
if(!obj.np){
$('#song-title').html("Empty channel. Add some songs!");
@@ -99,7 +99,8 @@ var Player = {
}
//List.importOldList(channel.toLowerCase());
} else if(paused){
} else if(paused || was_stopped){
Player.getTitle(obj.np[0].title, viewers);
//Player.setBGimage(video_id);
if(!Helper.mobilecheck()) {
@@ -128,6 +129,7 @@ var Player = {
startTime = time - conf.startTime;
song_title = obj.np[0].title;
duration = obj.np[0].duration;
Player.cueVideoById(video_id, duration);
//Player.setBGimage(video_id);
} else if(!paused){
//Helper.log("gotten new song");
@@ -187,14 +189,15 @@ var Player = {
} else {
if(compared || chromecastAvailable){
Player.loadVideoById(video_id, duration);
if(paused && !chromecastAvailable){
Player.cueVideoById(video_id, duration);
} else {
Player.loadVideoById(video_id, duration);
Player.seekTo(seekTo);
}
if(!Helper.mobilecheck()) {
Player.notifyUser(video_id, song_title);
}
Player.seekTo(seekTo);
if(paused && !chromecastAvailable){
Player.pauseVideo();
}
}
if(!paused){
if(((!mobile_beginning || chromecastAvailable) && prev_state != 2) && autoplay) {
@@ -215,7 +218,7 @@ var Player = {
}
}
}catch(e) {
if(chromecastAvailable) {
if(chromecastAvailable && !paused) {
Player.loadVideoById(video_id, duration);
Player.seekTo(seekTo);
}
@@ -397,6 +400,18 @@ var Player = {
}
},
cueVideoById: function(id, this_duration, start, end){
var s;
var e;
if(start) s = start;
else s = Player.np.start;
if(end) e = end;
else e = Player.np.end;
Player.player.cueVideoById({'videoId': id, 'startSeconds': s, 'endSeconds': e});
},
stopVideo: function(){
if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.me", {type: "stopVideo"});
@@ -561,21 +576,25 @@ var Player = {
$(".video-container").removeClass("no-opacity");
$("#controls").css("opacity", "1");
$(".playlist").css("opacity", "1");
Player.loadVideoById(video_id, duration);
if(autoplay) {
Player.loadVideoById(video_id, duration);
} else {
Player.cueVideoById(video_id, duration);
}
if(autoplay && (!Helper.mobilecheck() || chromecastAvailable)) {
Player.playVideo();
//Player.playVideo();
}
if(!durationBegun) {
Player.durationSetter();
}
if(embed){
setTimeout(function(){
Player.player.seekTo(seekTo);
//setTimeout(function(){
//Player.player.seekTo(seekTo);
if(!autoplay){
Player.player.pauseVideo();
Player.player.stopVideo();
Playercontrols.play_pause_show();
}
}, 1000);
//}, 1000);
}else
Player.seekTo(seekTo);
}