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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2018-07-23 16:17:04 +02:00
commit 2b62f08c8e
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
embed/core.js
View file

@ -161,7 +161,19 @@ MistPlayer.prototype.setTracks = function(usetracks){
this.element.load(); this.element.load();
} }
this.element.currentTime = time;
if (this.element.currentTime != time) {
try {
this.element.currentTime = time;
}
catch (e) {
var f = function(){
this.currentTime = time;
this.removeEventListener("loadeddata",f);
};
this.element.addEventListener("loadeddata",f);
}
}
if ('trackselects' in this) { if ('trackselects' in this) {
for (var i in usetracks) { for (var i in usetracks) {
@ -915,7 +927,7 @@ function mistPlay(streamName,options) {
button.appendChild(t); button.appendChild(t);
err.appendChild(button); err.appendChild(button);
button.onclick = function(){ button.onclick = function(){
options.target.removeChild(err); if (err.parentElement) { err.parentElement.removeChild(err); }
delete options.startCombo; delete options.startCombo;
if (err.timeOut) { if (err.timeOut) {
clearTimeout(err.timeOut); clearTimeout(err.timeOut);
@ -1429,7 +1441,7 @@ function mistPlay(streamName,options) {
} }
catch (e) { catch (e) {
//show the next player/reload buttons if there is an error in the player build code //show the next player/reload buttons if there is an error in the player build code
player.askNextCombo('Error while building player: '+e.stack); player.askNextCombo('Error while building player'+("stack" in e ? ": "+e.stack : ""));
throw e; throw e;
player.report({ player.report({
type: 'init', type: 'init',