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

Updated chromecast view, volume now changes volume on chromecast

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-12-10 21:08:43 +01:00
parent dd6fdc493c
commit a372494f55
7 changed files with 95 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/css/style.css
View File

@@ -1149,11 +1149,11 @@ ul #chat-log{
font-size:18px; font-size:18px;
} }
.castButton-active, .castButton-active:active, .castButton-active:hover, .castButton-active:focus{ /*.castButton-active, .castButton-active:active, .castButton-active:hover, .castButton-active:focus{
font-size: 5rem; font-size: 5rem;
margin-top: -70px; margin-top: -70px;
margin-right: 52%; margin-right: 52%;
} }*/
.chat-link{ .chat-link{
-webkit-transition:color 1s; -webkit-transition:color 1s;

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

37
static/js/listeners.js
View File

@@ -39,6 +39,7 @@ var access_token_data_youtube = {};
var youtube_authenticated = false; var youtube_authenticated = false;
var chromecastAvailable = false; var chromecastAvailable = false;
var color = "808080"; var color = "808080";
var chromecastReady = false;
var castSession; var castSession;
if(localStorage.debug === undefined){ if(localStorage.debug === undefined){
@@ -232,15 +233,17 @@ function init(){
$("#embed-area").val(embed_code(embed_autoplay, embed_width, embed_height, color)); $("#embed-area").val(embed_code(embed_autoplay, embed_width, embed_height, color));
$("#search").attr("placeholder", "Find song on YouTube..."); $("#search").attr("placeholder", "Find song on YouTube...");
if(chromecastAvailable){ if(chromecastAvailable){
hide_native(1); hide_native(1);
} else if(chromecastReady) {
initializeCastApi();
} else { } else {
window['__onGCastApiAvailable'] = function(isAvailable) { window['__onGCastApiAvailable'] = function(loaded, errorInfo) {
if (isAvailable) { if (loaded) {
initializeCastApi(); initializeCastApi();
} else {
} }
}; }
} }
} }
@@ -299,37 +302,33 @@ function hide_native(way){
$(".castButton").toggleClass("hide"); $(".castButton").toggleClass("hide");
$(".castButton-active").toggleClass("hide"); $(".castButton-active").toggleClass("hide");
if(way == 1){ if(way == 1){
$("#playpause").toggleClass("hide");
$("#duration").toggleClass("hide"); $("#duration").toggleClass("hide");
$("#fullscreen").toggleClass("hide"); $("#fullscreen").toggleClass("hide");
$("#volume-button").toggleClass("hide");
$("#volume").toggleClass("hide");
try{ try{
Player.player.stopVideo(); Player.player.stopVideo();
} catch(e){} } catch(e){}
Player.stopInterval = true; Player.stopInterval = true;
//$("#player").toggleClass("hide");
$("#player_overlay").removeClass("hide"); $("#player_overlay").removeClass("hide");
$("#player_overlay_controls").removeClass("hide"); $("#player_overlay").css("display", "block");
//$("#player_overlay").css("display", "block"); $("#player_overlay").css("background", "url(https://img.youtube.com/vi/" + video_id + "/hqdefault.jpg)");
$("#player_overlay").css("height", "100%"); $("#player_overlay").css("background-position", "center");
$("#player_overlay").css("background-size", "100%");
$("#player_overlay").css("background-color", "black");
$("#player_overlay").css("background-repeat", "no-repeat");
$("#player_overlay").css("height", "calc(100% - 32px)");
Player.player.setVolume(100);
$("#volume").slider("value", 100);
$("#player_overlay_text").toggleClass("hide"); $("#player_overlay_text").toggleClass("hide");
$("#player_overlay_controls").css("display", "inherit");
} else if(way == 0){ } else if(way == 0){
$("#playpause").toggleClass("hide");
$("#duration").toggleClass("hide"); $("#duration").toggleClass("hide");
$("#fullscreen").toggleClass("hide"); $("#fullscreen").toggleClass("hide");
$("#volume-button").toggleClass("hide");
$("#volume").toggleClass("hide");
Player.player.playVideo(); Player.player.playVideo();
Player.stopInterval = false; Player.stopInterval = false;
Player.durationSetter(); Player.durationSetter();
//$("#player").toggleClass("hide"); Player.player.setVolume(Crypt.get_volume());
$("#volume").slider("value", Crypt.get_volume());
$("#player_overlay").addClass("hide"); $("#player_overlay").addClass("hide");
$("#player_overlay_controls").addClass("hide");
$("#player_overlay").css("height", "100%");
$("#player_overlay_text").toggleClass("hide"); $("#player_overlay_text").toggleClass("hide");
$("#player_overlay_controls").css("display", "none");
socket.emit('pos', {channel: chan.toLowerCase()}); socket.emit('pos', {channel: chan.toLowerCase()});
} }
} }

8
static/js/nochan.js
View File

@@ -377,4 +377,12 @@ function initfp(){
$(".mega").prepend('<div id="snow"></div>'); $(".mega").prepend('<div id="snow"></div>');
//Nochan.start_snowfall(); //Nochan.start_snowfall();
} }
window['__onGCastApiAvailable'] = function(loaded, errorInfo) {
if (loaded) {
chromecastReady = true;
} else {
console.log(errorInfo);
}
}
} }

22
static/js/player.js
View File

@@ -160,8 +160,9 @@ var Player = {
playVideo: function(){ playVideo: function(){
if(chromecastAvailable){ if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.no", {type: "playVideo"}); //castSession.sendMessage("urn:x-cast:zoff.no", {type: "playVideo"});
//socket.emit('pos', {channel: chan.toLowerCase()}); //socket.emit('pos', {channel: chan.toLowerCase()});
Playercontrols.play_pause();
} else { } else {
Player.player.playVideo(); Player.player.playVideo();
} }
@@ -169,7 +170,8 @@ var Player = {
pauseVideo: function(){ pauseVideo: function(){
if(chromecastAvailable){ if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.no", {type: "pauseVideo"}); //castSession.sendMessage("urn:x-cast:zoff.no", {type: "pauseVideo"});
Playercontrols.play_pause();
} else { } else {
Player.player.pauseVideo(); Player.player.pauseVideo();
} }
@@ -199,6 +201,14 @@ var Player = {
} }
}, },
setVolume: function(vol){
if(chromecastAvailable){
castSession.setVolume(vol/100);
} else {
Player.player.setVolume(vol);
}
},
sendNext: function(obj){ sendNext: function(obj){
if(chromecastAvailable){ if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.no", {type: "nextVideo", title: obj.title, videoId: obj.videoId}); castSession.sendMessage("urn:x-cast:zoff.no", {type: "nextVideo", title: obj.title, videoId: obj.videoId});
@@ -217,6 +227,14 @@ var Player = {
elem.innerHTML = title; elem.innerHTML = title;
getTitleViews.innerHTML = v + " " + outPutWord; getTitleViews.innerHTML = v + " " + outPutWord;
elem.title = title; elem.title = title;
if(chromecastAvailable){
$("#player_overlay").css("background", "url(https://img.youtube.com/vi/" + video_id + "/hqdefault.jpg)");
$("#player_overlay").css("background-position", "center");
$("#player_overlay").css("background-size", "100%");
$("#player_overlay").css("background-color", "black");
$("#player_overlay").css("background-repeat", "no-repeat");
$("#player_overlay").css("height", "calc(100% - 32px)");
}
} }
document.title = title + " • Zöff / "+chan; document.title = title + " • Zöff / "+chan;

68
static/js/playercontrols.js
View File

@@ -53,35 +53,51 @@ var Playercontrols = {
play_pause: function() play_pause: function()
{ {
if(!chromecastAvailable){
if(Player.player.getPlayerState() == 1) if(Player.player.getPlayerState() == 1)
{ {
Player.pauseVideo(); Player.pauseVideo();
if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){ if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
document.getElementById("player").style.display = "none"; document.getElementById("player").style.display = "none";
$(".video-container").toggleClass("click-through"); $(".video-container").toggleClass("click-through");
$(".page-footer").toggleClass("padding-bottom-extra"); $(".page-footer").toggleClass("padding-bottom-extra");
} }
} else if(Player.player.getPlayerState() == 2 || Player.player.getPlayerState() === 0) } else if(Player.player.getPlayerState() == 2 || Player.player.getPlayerState() === 0)
{ {
Player.playVideo(); Player.playVideo();
if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){ if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
document.getElementById("player").style.display = "block"; document.getElementById("player").style.display = "block";
$(".video-container").toggleClass("click-through"); $(".video-container").toggleClass("click-through");
$(".page-footer").toggleClass("padding-bottom-extra"); $(".page-footer").toggleClass("padding-bottom-extra");
} }
} }
} else {
Playercontrols.play_pause_show();
}
}, },
play_pause_show: function() play_pause_show: function()
{ {
if(document.getElementById("pause").className.split(" ").length == 1){ if(chromecastAvailable){
$("#pause").toggleClass("hide"); if($("#play").hasClass("hide")){
$("#pause-overlay").toggleClass("hide"); castSession.sendMessage("urn:x-cast:zoff.no", {type: "pauseVideo"});
} $("#play").toggleClass("hide");
if(document.getElementById("play").className.split(" ").length == 2){ $("#pause").toggleClass("hide");
$("#play").toggleClass("hide"); } else if($("#pause").hasClass("hide")){
$("#play-overlay").toggleClass("hide"); castSession.sendMessage("urn:x-cast:zoff.no", {type: "playVideo"});
$("#play").toggleClass("hide");
$("#pause").toggleClass("hide");
}
} else {
if(document.getElementById("pause").className.split(" ").length == 1){
$("#pause").toggleClass("hide");
$("#pause-overlay").toggleClass("hide");
}
if(document.getElementById("play").className.split(" ").length == 2){
$("#play").toggleClass("hide");
$("#play-overlay").toggleClass("hide");
}
} }
}, },
@@ -117,7 +133,7 @@ var Playercontrols = {
setVolume: function(vol) setVolume: function(vol)
{ {
Player.player.setVolume(vol); Player.setVolume(vol);
Playercontrols.choose_button(vol, false); Playercontrols.choose_button(vol, false);
if(Player.player.isMuted()) if(Player.player.isMuted())
Player.player.unMute(); Player.player.unMute();