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

Added open in YouTube button on search, and setting start/endtime of YouTube video.

Browse Source 
- Opening for further development with userset end/starttime
This commit is contained in:
Kasper Rynning-Tønnesen
2017-05-29 22:20:05 +02:00
parent c10477f4e0
commit 7678ce5dbe
7 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,7 +93,7 @@ var Player = {
try{
if(Player.player.getVideoUrl().split('v=')[1] != video_id || chromecastAvailable){
Player.loadVideoById(video_id);
Player.loadVideoById(video_id, duration);
if(!Helper.mobilecheck()) {
Player.notifyUser(video_id, song_title);
}
@@ -120,7 +120,7 @@ var Player = {
}
}catch(e){
if(chromecastAvailable){
Player.loadVideoById(video_id);
Player.loadVideoById(video_id, duration);
Player.seekTo(seekTo);
}
if(!durationBegun && !chromecastAvailable) {
@@ -238,13 +238,13 @@ var Player = {
}
},
loadVideoById: function(id){
loadVideoById: function(id, this_duration){
if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", videoId: id});
chrome.cast.media.GenericMediaMetadata({metadataType: "GENERIC", title:song_title, image: 'https://img.youtube.com/vi/'+id+'/mqdefault.jpg'});
chrome.cast.Image('https://img.youtube.com/vi/'+id+'/mqdefault.jpg');
} else {
Player.player.loadVideoById(id, 0);
Player.player.loadVideoById({'videoId': id, 'startSeconds': 0, 'endSeconds': this_duration});
}
},
@@ -279,7 +279,7 @@ var Player = {
chrome.cast.media.GenericMediaMetadata({metadataType: "GENERIC", title:song_title, image: 'https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg'});
chrome.cast.Image('https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg');
} else {
Player.loadVideoById(video_id);
Player.loadVideoById(video_id, duration);
}
List.channel_function({type:"song_change", time: time});
},
@@ -322,7 +322,7 @@ var Player = {
socket.emit("skip", {error: newState.data, id: video_id, pass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
} else if(video_id !== undefined) {
Player.loadVideoById(video_id);
Player.loadVideoById(video_id, duration);
}
}
},
@@ -341,7 +341,7 @@ var Player = {
$("#player").css("opacity", "1");
$("#controls").css("opacity", "1");
$(".playlist").css("opacity", "1");
Player.loadVideoById(video_id);
Player.loadVideoById(video_id, duration);
if(autoplay && (!Helper.mobilecheck() || chromecastAvailable)) {
Player.playVideo();
}