More chromecastfeatures

- Click on player pauses/plays video
- Receives event on play/pause
- Some indentationfixes
- Not showing Join Channel modal when chromecast connected
This commit is contained in:
Kasper Rynning-Tønnesen
2018-02-26 18:45:17 +01:00
parent 78fad1bbe0
commit ce656b97bc
4 changed files with 37 additions and 13 deletions

View File

@@ -108,19 +108,31 @@ function chromecastListener(evt, data) {
var json_parsed = JSON.parse(data);
switch(json_parsed.type){
case -1:
if(offline){
Player.playNext();
} else {
socket.emit("end", {id: json_parsed.videoId, channel: chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
}
break;
if(offline){
Player.playNext();
} else {
socket.emit("end", {id: json_parsed.videoId, channel: chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
}
break;
case 0:
if(offline){
Player.playNext();
} else {
socket.emit("skip", {error: json_parsed.data_code, id: json_parsed.videoId, pass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
}
break;
if(offline){
Player.playNext();
} else {
socket.emit("skip", {error: json_parsed.data_code, id: json_parsed.videoId, pass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
}
break;
case 1:
if(!$("#play").hasClass("hide")) {
$("#play").addClass("hide");
}
$("#pause").removeClass("hide");
break;
case 2:
if(!$("#pause").hasClass("hide")) {
$("#pause").addClass("hide");
}
$("#play").removeClass("hide");
break;
}
}

View File

@@ -842,7 +842,7 @@ var List = {
},
show: function() {
if(!Helper.mobilecheck())
if(!Helper.mobilecheck() && !chromecastAvailable)
{
$("#channel-share-modal").modal("open");
}

View File

@@ -327,6 +327,12 @@ initializeCastApi = function() {
}
};
$(document).on("click", "#player_overlay", function(e) {
if(chromecastAvailable) {
Player.playPauseVideo();
}
});
$(document).on("click", "#bitcoin-address", function(e) {
var copyTextarea = document.querySelector('#bitcoin-address');
copyTextarea.select();

View File

@@ -283,6 +283,12 @@ var Player = {
}
},
playPauseVideo: function() {
if(chromecastAvailable) {
castSession.sendMessage("urn:x-cast:zoff.me", {type: "playPauseVideo"});
}
}
playVideo: function(){
if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.me", {type: "playVideo"});