cybafelo
/
r3-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

audio system respect mute before play

beta.r3js.org
-=yb4f310 2017-11-28 09:09:02 +01:00
parent 12077d7a9a
commit d793bc1b58
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/game-lib-min.js vendored
View File

File diff suppressed because one or more lines are too long

24
build/game-lib.js
View File

@ -1,5 +1,5 @@
// 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
/**
@ -25729,6 +25729,18 @@ GameLib.System.Audio.prototype.playAudio = function(data) {
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.instance.isPlaying) {
audio.instance.stop();
@ -25739,7 +25751,7 @@ GameLib.System.Audio.prototype.playAudio = function(data) {
audio.instance.play();
}
}
}
}.bind(this)
);
if (!found) {
@ -25774,7 +25786,13 @@ GameLib.System.Audio.prototype.continueAllAudio = function(data) {
function(audio) {
// audio.instance.context.currentTime = audio.currentTime;
audio.paused = false;
audio.updateInstance('paused');
GameLib.Event.Emit(
GameLib.Event.PLAY_AUDIO,
{
name : audio.name
}
);
// audio.updateInstance('paused');
}
);