hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Embed: fixed checkCombo

Browse source
This commit is contained in:
Cat 2021-06-07 16:13:28 +02:00 • committed by Thulinma
parent 35a98178f1
commit 9d274fd64b
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
embed/min/player.js
View file

File diff suppressed because one or more lines are too long

25
embed/player.js
View file

@ -111,14 +111,7 @@ function MistVideo(streamName,options) {
var source = false; var source = false;
var mistPlayer = false; var mistPlayer = false;
if (options.startCombo) {
options.startCombo.started = {
player: false,
source: false
};
}
//retrieve the sources we can loop over //retrieve the sources we can loop over
var sources; var sources;
if (options.forceSource) { if (options.forceSource) {
@ -199,6 +192,20 @@ function MistVideo(streamName,options) {
current: false current: false
} }
}; };
if (options.startCombo) {
options.startCombo.started = {
player: false,
source: false
};
for (var i = 0; i < players.length; i++) {
if (players[i].shortname == options.startCombo.player) {
options.startCombo.player = i;
break;
}
}
}
function checkStartCombo(which) { function checkStartCombo(which) {
if ((options.startCombo) && (!options.startCombo.started[which])) { if ((options.startCombo) && (!options.startCombo.started[which])) {
@ -952,6 +959,7 @@ function MistVideo(streamName,options) {
socket.die = false; socket.die = false;
socket.destroy = function(){ socket.destroy = function(){
this.die = true; this.die = true;
this.onclose = function(){};
this.close(); this.close();
}; };
socket.onopen = function(e){ socket.onopen = function(e){
@ -1045,7 +1053,6 @@ function MistVideo(streamName,options) {
MistVideo.reporting.stats.set("lastError",e.message); MistVideo.reporting.stats.set("lastError",e.message);
}); });
if (Object && Object.defineProperty) { if (Object && Object.defineProperty) {
var timeWaiting = 0; var timeWaiting = 0;
var waitingSince = false; var waitingSince = false;