From bfd8b3690e81b6aa05056994cf20352a61514e6b Mon Sep 17 00:00:00 2001 From: jorsi Date: Tue, 2 Jun 2020 16:02:12 -0400 Subject: [PATCH] add function to get current volume --- script/audio.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/script/audio.js b/script/audio.js index ff9f311..4727c07 100644 --- a/script/audio.js +++ b/script/audio.js @@ -194,18 +194,24 @@ var AudioEngine = { AudioEngine.audioContext.currentTime + AudioEngine.FADE_TIME ); }, - setVolume: function (volume) { + getVolume: function () { + return AudioEngine.master.gain.value; + }, + setVolume: function (volume, s) { if (!AudioEngine.master) return; // master may not be ready yet if (!volume) { volume = 1.0; } + if (!s) { + s = 1.0; + } AudioEngine.master.gain.setValueAtTime( AudioEngine.master.gain.value, AudioEngine.audioContext.currentTime ); AudioEngine.master.gain.linearRampToValueAtTime( volume, - AudioEngine.audioContext.currentTime + AudioEngine.FADE_TIME / 2 + AudioEngine.audioContext.currentTime + s ); } }; \ No newline at end of file