diff --git a/public/js/app.js b/public/js/app.js index 10adefd..62e70b5 100755 --- a/public/js/app.js +++ b/public/js/app.js @@ -4705,14 +4705,9 @@ class SoundManager { audioObject.timeOffset = Helper.nonNull(options.timeOffset, audioObject.timeOffset, 0); this.channels[channel] = audioObject; - console.log(options); - if (audioObject.muted){ this.stop(channel); } - else if (Helper.isNotNull(options.muted) && options.muted === false){ - // this.play(channel); - } return this.channels[channel]; } @@ -4731,7 +4726,6 @@ class SoundManager { this.stop(channel); this.set(audioOrOptions, channel); - console.log(this.channels[channel]); if (!this.channels[channel].muted) { let buffer = await this.channels[channel].loadedPromise; let source = this.context.createBufferSource(); @@ -4741,6 +4735,10 @@ class SoundManager { source.loop = this.channels[channel].loop; gain.gain.value = this.channels[channel].volume; + //to prevent gap in mp3-files + source.loopStart = 0.3; + source.loopEnd = buffer.duration-0.3; + source.connect(gain); gain.connect(this.context.destination); source.start(0); @@ -6341,7 +6339,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.6, muted: !settingsManager.getSetting("play-music", true)}); + soundManager.play(SoundManager.CHANNELS.MUSIC, {audio: "sound/brightAndBeautifull__.mp3", loop: true, volume: 0.6, muted: !settingsManager.getSetting("play-music", true)}); app.start(SynchronizeSite); Translator.setLanguage("de"); diff --git a/public/sound/brightAndBeautifull__.mp3 b/public/sound/brightAndBeautifull__.mp3 new file mode 100644 index 0000000..bc93faa Binary files /dev/null and b/public/sound/brightAndBeautifull__.mp3 differ diff --git a/src/js/init.js b/src/js/init.js index b597655..0823aa4 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.6, muted: !settingsManager.getSetting("play-music", true)}); + soundManager.play(SoundManager.CHANNELS.MUSIC, {audio: "sound/brightAndBeautifull__.mp3", 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 1f071c8..9a36f61 100755 --- a/src/js/lib/pwa-assets.js +++ b/src/js/lib/pwa-assets.js @@ -141,14 +141,9 @@ class SoundManager { audioObject.timeOffset = Helper.nonNull(options.timeOffset, audioObject.timeOffset, 0); this.channels[channel] = audioObject; - console.log(options); - if (audioObject.muted){ this.stop(channel); } - else if (Helper.isNotNull(options.muted) && options.muted === false){ - // this.play(channel); - } return this.channels[channel]; } @@ -167,7 +162,6 @@ class SoundManager { this.stop(channel); this.set(audioOrOptions, channel); - console.log(this.channels[channel]); if (!this.channels[channel].muted) { let buffer = await this.channels[channel].loadedPromise; let source = this.context.createBufferSource(); @@ -177,6 +171,10 @@ class SoundManager { source.loop = this.channels[channel].loop; gain.gain.value = this.channels[channel].volume; + //to prevent gap in mp3-files + source.loopStart = 0.3; + source.loopEnd = buffer.duration-0.3; + source.connect(gain); gain.connect(this.context.destination); source.start(0); diff --git a/public/sound/brightAndBeautifull__.wav b/src/sound/brightAndBeautifull__.wav similarity index 100% rename from public/sound/brightAndBeautifull__.wav rename to src/sound/brightAndBeautifull__.wav