From 877ff297c67aacb43f426a4be2b3e0cefc1ff88e Mon Sep 17 00:00:00 2001 From: silas Date: Wed, 26 Sep 2018 14:36:07 +0200 Subject: [PATCH] =?UTF-8?q?Lautst=C3=A4rke=20angepasst?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/app.js | 12 +++++++++--- src/js/init.js | 2 +- src/js/lib/pwa-assets.js | 8 +++++++- src/module/Application/pwa/js/site/LevelSite.js | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/public/js/app.js b/public/js/app.js index af13d86..10adefd 100755 --- a/public/js/app.js +++ b/public/js/app.js @@ -4735,10 +4735,16 @@ class SoundManager { if (!this.channels[channel].muted) { let buffer = await this.channels[channel].loadedPromise; let source = this.context.createBufferSource(); + let gain = this.context.createGain(); + source.buffer = buffer; - source.connect(this.context.destination); source.loop = this.channels[channel].loop; + gain.gain.value = this.channels[channel].volume; + + source.connect(gain); + gain.connect(this.context.destination); source.start(0); + this.channels[channel].source = source; } return this.channels[channel]; @@ -5769,7 +5775,7 @@ class LevelSite extends WordRotatorBaseSite { let settingsManager = SettingsManager.getInstance(); let soundManager = SoundManager.getInstance(); - soundManager.set({audio: "sound/single_coin_fall_on_concrete_.mp3", muted: !settingsManager.getSetting("play-sound")}, SoundManager.CHANNELS.SOUND); + soundManager.set({audio: "sound/single_coin_fall_on_concrete_.mp3", muted: !settingsManager.getSetting("play-sound"), volume:0.7}, SoundManager.CHANNELS.SOUND); return super.onConstruct(args); } @@ -6335,7 +6341,7 @@ InitPromise.resolve(app).then(function(){ let settingsManager = SettingsManager.getInstance(); let soundManager = SoundManager.getInstance(); - soundManager.play(SoundManager.CHANNELS.MUSIC, {audio: "sound/brightAndBeautifull__.wav", loop: true, volume: 0.3, muted: !settingsManager.getSetting("play-music", true)}); + soundManager.play(SoundManager.CHANNELS.MUSIC, {audio: "sound/brightAndBeautifull__.wav", loop: true, volume: 0.6, muted: !settingsManager.getSetting("play-music", true)}); app.start(SynchronizeSite); Translator.setLanguage("de"); diff --git a/src/js/init.js b/src/js/init.js index 06aa84f..b597655 100755 --- a/src/js/init.js +++ b/src/js/init.js @@ -61,7 +61,7 @@ InitPromise.resolve(app).then(function(){ let settingsManager = SettingsManager.getInstance(); let soundManager = SoundManager.getInstance(); - soundManager.play(SoundManager.CHANNELS.MUSIC, {audio: "sound/brightAndBeautifull__.wav", loop: true, volume: 0.3, muted: !settingsManager.getSetting("play-music", true)}); + soundManager.play(SoundManager.CHANNELS.MUSIC, {audio: "sound/brightAndBeautifull__.wav", loop: true, volume: 0.6, muted: !settingsManager.getSetting("play-music", true)}); app.start(SynchronizeSite); Translator.setLanguage("de"); diff --git a/src/js/lib/pwa-assets.js b/src/js/lib/pwa-assets.js index dd5a44d..1f071c8 100755 --- a/src/js/lib/pwa-assets.js +++ b/src/js/lib/pwa-assets.js @@ -171,10 +171,16 @@ class SoundManager { if (!this.channels[channel].muted) { let buffer = await this.channels[channel].loadedPromise; let source = this.context.createBufferSource(); + let gain = this.context.createGain(); + source.buffer = buffer; - source.connect(this.context.destination); source.loop = this.channels[channel].loop; + gain.gain.value = this.channels[channel].volume; + + source.connect(gain); + gain.connect(this.context.destination); source.start(0); + this.channels[channel].source = source; } return this.channels[channel]; diff --git a/src/module/Application/pwa/js/site/LevelSite.js b/src/module/Application/pwa/js/site/LevelSite.js index 65d6c33..871f12a 100755 --- a/src/module/Application/pwa/js/site/LevelSite.js +++ b/src/module/Application/pwa/js/site/LevelSite.js @@ -37,7 +37,7 @@ export class LevelSite extends WordRotatorBaseSite { let settingsManager = SettingsManager.getInstance(); let soundManager = SoundManager.getInstance(); - soundManager.set({audio: "sound/single_coin_fall_on_concrete_.mp3", muted: !settingsManager.getSetting("play-sound")}, SoundManager.CHANNELS.SOUND); + soundManager.set({audio: "sound/single_coin_fall_on_concrete_.mp3", muted: !settingsManager.getSetting("play-sound"), volume:0.7}, SoundManager.CHANNELS.SOUND); return super.onConstruct(args); }