audio system respect mute before play
parent
12077d7a9a
commit
d793bc1b58
File diff suppressed because one or more lines are too long
|
@ -1,5 +1,5 @@
|
||||||
// COMPILE TIME DEFINITIONS (Generated via gulp)
|
// COMPILE TIME DEFINITIONS (Generated via gulp)
|
||||||
var __DATE__ = "Tue Nov 28 2017 08:21:32 GMT+0100 (CET)";
|
var __DATE__ = "Tue Nov 28 2017 09:08:58 GMT+0100 (CET)";
|
||||||
// END COMPILE TIME DEFINITIONS
|
// END COMPILE TIME DEFINITIONS
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -25729,6 +25729,18 @@ GameLib.System.Audio.prototype.playAudio = function(data) {
|
||||||
console.log('audio not ready yet');
|
console.log('audio not ready yet');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.mute && typeof audio.backupVolume === 'undefined') {
|
||||||
|
audio.backupVolume = audio.volume;
|
||||||
|
audio.volume = 0;
|
||||||
|
audio.updateInstance('volume');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.mute && typeof audio.backupVolume === 'number') {
|
||||||
|
audio.volume = audio.backupVolume;
|
||||||
|
delete audio.backupVolume;
|
||||||
|
audio.updateInstance('volume');
|
||||||
|
}
|
||||||
|
|
||||||
if (audio.overplay) {
|
if (audio.overplay) {
|
||||||
if (audio.instance.isPlaying) {
|
if (audio.instance.isPlaying) {
|
||||||
audio.instance.stop();
|
audio.instance.stop();
|
||||||
|
@ -25739,7 +25751,7 @@ GameLib.System.Audio.prototype.playAudio = function(data) {
|
||||||
audio.instance.play();
|
audio.instance.play();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}.bind(this)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!found) {
|
if (!found) {
|
||||||
|
@ -25774,7 +25786,13 @@ GameLib.System.Audio.prototype.continueAllAudio = function(data) {
|
||||||
function(audio) {
|
function(audio) {
|
||||||
// audio.instance.context.currentTime = audio.currentTime;
|
// audio.instance.context.currentTime = audio.currentTime;
|
||||||
audio.paused = false;
|
audio.paused = false;
|
||||||
audio.updateInstance('paused');
|
GameLib.Event.Emit(
|
||||||
|
GameLib.Event.PLAY_AUDIO,
|
||||||
|
{
|
||||||
|
name : audio.name
|
||||||
|
}
|
||||||
|
);
|
||||||
|
// audio.updateInstance('paused');
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue