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

Trying fixes for mobile chromecasting and visuals

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-02-25 14:39:03 +01:00
parent 69abf6961a
commit 90735948bb
3 changed files with 68 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/public/assets/js/functions.js
View File

@@ -40,8 +40,6 @@ function hide_native(way) {
Player.player.stopVideo(); Player.player.stopVideo();
} catch(e){} } catch(e){}
Player.stopInterval = true; Player.stopInterval = true;
$("#player_overlay").removeClass("hide");
$("#player_overlay").css("display", "block");
if(Helper.mobilecheck()){ if(Helper.mobilecheck()){
if($("#pause").hasClass("hide")){ if($("#pause").hasClass("hide")){
$("#play").toggleClass("hide"); $("#play").toggleClass("hide");
@@ -53,13 +51,23 @@ function hide_native(way) {
} else { } else {
$("#volume").slider("value", 100); $("#volume").slider("value", 100);
} }
$("#player_overlay").css("background", "url(https://i.ytimg.com/vi/" + video_id + "/maxresdefault.jpg)"); if(Helper.mobilecheck()) {
$("#player_overlay").css("background-position", "center"); if(!$("#player_overlay").hasClass("hide")) {
$("#player_overlay").css("background-size", "100%"); $("#player_overlay").addClass("hide")
$("#player_overlay").css("background-color", "black"); }
$("#player_overlay").css("background-repeat", "no-repeat"); $("#player_overlay").css("display", "none");
$("#playing_on").css("display", "flex"); $("#playing_on").css("display", "none");
$("#chromecast_text").html("Playing on<br>" + castSession.La.friendlyName); } else {
$("#player_overlay").removeClass("hide");
$("#player_overlay").css("display", "block");
$("#player_overlay").css("background", "url(https://i.ytimg.com/vi/" + video_id + "/maxresdefault.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");
$("#playing_on").css("display", "flex");
$("#chromecast_text").html("Playing on<br>" + castSession.La.friendlyName);
}
Player.player.setVolume(100); Player.player.setVolume(100);
$("#player_overlay_text").toggleClass("hide"); $("#player_overlay_text").toggleClass("hide");

89
server/public/assets/js/listeners.js
View File

@@ -210,50 +210,57 @@ initializeCastApi = function() {
Helper.log(event.sessionState); Helper.log(event.sessionState);
switch (event.sessionState) { switch (event.sessionState) {
case cast.framework.SessionState.SESSION_STARTED: case cast.framework.SessionState.SESSION_STARTED:
castSession = cast.framework.CastContext.getInstance().getCurrentSession(); castSession = cast.framework.CastContext.getInstance().getCurrentSession();
castSession.addMessageListener("urn:x-cast:zoff.me", chromecastListener) castSession.addMessageListener("urn:x-cast:zoff.me", chromecastListener)
chrome.cast.media.GenericMediaMetadata({title:song_title, image: 'https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg'}); chrome.cast.media.GenericMediaMetadata({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'); chrome.cast.Image('https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg');
chromecastAvailable = true; chromecastAvailable = true;
paused = false; paused = false;
mobile_beginning = false; mobile_beginning = false;
var _seekTo; var _seekTo;
try{ try{
_seekTo = Player.player.getCurrentTime(); _seekTo = Player.player.getCurrentTime();
} catch(e){ } catch(e){
_seekTo = seekTo; _seekTo = seekTo;
} }
castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", start: Player.np.start, end: Player.np.end, videoId: video_id, seekTo: _seekTo, channel: chan.toLowerCase()}) castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", start: Player.np.start, end: Player.np.end, videoId: video_id, seekTo: _seekTo, channel: chan.toLowerCase()})
castSession.sendMessage("urn:x-cast:zoff.me", {type: "nextVideo", videoId: full_playlist[0].id, title: full_playlist[0].title}) castSession.sendMessage("urn:x-cast:zoff.me", {type: "nextVideo", videoId: full_playlist[0].id, title: full_playlist[0].title})
if(Helper.mobilecheck() && !chromecast_specs_sent) { if(Helper.mobilecheck() && !chromecast_specs_sent) {
chromecast_specs_sent = true; chromecast_specs_sent = true;
castSession.sendMessage("urn:x-cast:zoff.me", {type: "mobilespecs", guid: guid, socketid: socket.id, adminpass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))}) castSession.sendMessage("urn:x-cast:zoff.me", {type: "mobilespecs", guid: guid, socketid: socket.id, adminpass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))})
} }
hide_native(1); hide_native(1);
break; if(Helper.mobilecheck()) {
Player.playVideo();
}
$("#channel-load").css("display", "none");
$('.castButton').addClass('castButton-white-active');
break;
case cast.framework.SessionState.SESSION_RESUMED: case cast.framework.SessionState.SESSION_RESUMED:
castSession = cast.framework.CastContext.getInstance().getCurrentSession(); castSession = cast.framework.CastContext.getInstance().getCurrentSession();
castSession.addMessageListener("urn:x-cast:zoff.me", chromecastListener); castSession.addMessageListener("urn:x-cast:zoff.me", chromecastListener);
chrome.cast.media.GenericMediaMetadata({title:song_title, image: 'https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg'}); chrome.cast.media.GenericMediaMetadata({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'); chrome.cast.Image('https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg');
chromecastAvailable = true; chromecastAvailable = true;
paused = false; paused = false;
mobile_beginning = false; mobile_beginning = false;
var _seekTo; var _seekTo;
try{ try{
_seekTo = Player.player.getCurrentTime(); _seekTo = Player.player.getCurrentTime();
} catch(e){ } catch(e){
_seekTo = seekTo; _seekTo = seekTo;
} }
castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", start: Player.np.start, end: Player.np.end, videoId: video_id, seekTo: _seekTo, channel: chan.toLowerCase()}) castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", start: Player.np.start, end: Player.np.end, videoId: video_id, seekTo: _seekTo, channel: chan.toLowerCase()})
castSession.sendMessage("urn:x-cast:zoff.me", {type: "nextVideo", videoId: full_playlist[0].id, title: full_playlist[0].title}) castSession.sendMessage("urn:x-cast:zoff.me", {type: "nextVideo", videoId: full_playlist[0].id, title: full_playlist[0].title})
hide_native(1); hide_native(1);
break; $("#channel-load").css("display", "none");
$('.castButton').addClass('castButton-white-active');
break;
case cast.framework.SessionState.SESSION_ENDED: case cast.framework.SessionState.SESSION_ENDED:
chromecastAvailable = false; chromecastAvailable = false;
hide_native(0); hide_native(0);
break; break;
} }
}); });

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

@@ -639,7 +639,9 @@ var Player = {
//currDurr = currDurr - Player.np.start; //currDurr = currDurr - Player.np.start;
minutes = Math.floor(currDurr / 60); minutes = Math.floor(currDurr / 60);
seconds = currDurr - (minutes * 60); seconds = currDurr - (minutes * 60);
document.getElementById("duration").innerHTML = Helper.pad(minutes)+":"+Helper.pad(seconds)+" <span id='dash'>/</span> "+Helper.pad(dMinutes)+":"+Helper.pad(dSeconds); if(!isNaN(minutes) && !isNaN(seconds) && !isNaN(dMinutes) && !isNaN(dSeconds)) {
$("#duration").html(Helper.pad(minutes)+":"+Helper.pad(seconds)+" <span id='dash'>/</span> "+Helper.pad(dMinutes)+":"+Helper.pad(dSeconds));
}
per = (100 / duration) * currDurr; per = (100 / duration) * currDurr;
if(per >= 100) { if(per >= 100) {
per = 100; per = 100;