From 05188e37fd5aa81e1d819ec83c10a4f151c0b405 Mon Sep 17 00:00:00 2001
From: silas <silas@silas.link>
Date: Wed, 10 Oct 2018 19:27:59 +0200
Subject: [PATCH] Musik bugfixes

---
 public/js/app.js                               | 9 +++++----
 src/js/lib/pwa-assets.js                       | 5 +++--
 src/module/Application/pwa/js/site/MenuSite.js | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/public/js/app.js b/public/js/app.js
index eebee69..09bc0df 100755
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -4938,7 +4938,7 @@ class AudioChain {
         await this.chainFunction(source);
 
         source.start(delay, offset, duration);
-        this.startTime = (new Date()).getTime();
+        this.startTime = (new Date()).getTime() - (Helper.nonNull(offset, 0) * 1000);
         this.source = source;
         this.running = true;
     }
@@ -4946,13 +4946,14 @@ class AudioChain {
     async stop(delay) {
         if (Helper.isNotNull(this.source)) {
             this.pauseTime = ((new Date()).getTime()) - this.startTime;
+            this.running = false;
             return this.source.stop(delay);
         }
-        this.running = false;
         return null;
     }
 
     async resume() {
+
         if (!this.running) {
             return this.start(null, Helper.nonNull(this.pauseTime, 0) / 1000.0);
         }
@@ -6686,7 +6687,7 @@ class MenuSite extends WordRotatorBaseSite {
         let playMusicButton = this.findBy("#play-music");
         playMusicButton.checked = settingsManager.getSetting("play-music", true);
         playMusicButton.addEventListener("change", () => {
-            settingsManager.setSetting("play-music", playMusicButton.checked);
+            settingsManager.setSetting("play-music", (playMusicButton.checked)?"1":"0");
             soundManager.set({muted: !playMusicButton.checked}, SoundManager.CHANNELS.MUSIC);
             if (playMusicButton.checked) {
                 soundManager.play(SoundManager.CHANNELS.MUSIC);
@@ -6697,7 +6698,7 @@ class MenuSite extends WordRotatorBaseSite {
         let playSoundButton = this.findBy("#play-sound");
         playSoundButton.checked = settingsManager.getSetting("play-sound", true);
         playSoundButton.addEventListener("change", () => {
-            settingsManager.setSetting("play-sound", playSoundButton.checked);
+            settingsManager.setSetting("play-sound", (playSoundButton.checked)?"1":"0");
             soundManager.set({muted: !playSoundButton.checked}, SoundManager.CHANNELS.SOUND);
             Matomo.push(["trackEvent", "MainMenu", "PlaySound", "Play Sound", (playSoundButton.checked) ? 1 : 0]);
         });
diff --git a/src/js/lib/pwa-assets.js b/src/js/lib/pwa-assets.js
index 88a5b02..2e5b6f7 100755
--- a/src/js/lib/pwa-assets.js
+++ b/src/js/lib/pwa-assets.js
@@ -323,7 +323,7 @@ class AudioChain {
         await this.chainFunction(source);
 
         source.start(delay, offset, duration);
-        this.startTime = (new Date()).getTime();
+        this.startTime = (new Date()).getTime() - (Helper.nonNull(offset, 0) * 1000);
         this.source = source;
         this.running = true;
     }
@@ -331,13 +331,14 @@ class AudioChain {
     async stop(delay) {
         if (Helper.isNotNull(this.source)) {
             this.pauseTime = ((new Date()).getTime()) - this.startTime;
+            this.running = false;
             return this.source.stop(delay);
         }
-        this.running = false;
         return null;
     }
 
     async resume() {
+
         if (!this.running) {
             return this.start(null, Helper.nonNull(this.pauseTime, 0) / 1000.0);
         }
diff --git a/src/module/Application/pwa/js/site/MenuSite.js b/src/module/Application/pwa/js/site/MenuSite.js
index f26d76f..6705f13 100644
--- a/src/module/Application/pwa/js/site/MenuSite.js
+++ b/src/module/Application/pwa/js/site/MenuSite.js
@@ -138,7 +138,7 @@ export class MenuSite extends WordRotatorBaseSite {
         let playMusicButton = this.findBy("#play-music");
         playMusicButton.checked = settingsManager.getSetting("play-music", true);
         playMusicButton.addEventListener("change", () => {
-            settingsManager.setSetting("play-music", playMusicButton.checked);
+            settingsManager.setSetting("play-music", (playMusicButton.checked)?"1":"0");
             soundManager.set({muted: !playMusicButton.checked}, SoundManager.CHANNELS.MUSIC);
             if (playMusicButton.checked) {
                 soundManager.play(SoundManager.CHANNELS.MUSIC);
@@ -149,7 +149,7 @@ export class MenuSite extends WordRotatorBaseSite {
         let playSoundButton = this.findBy("#play-sound");
         playSoundButton.checked = settingsManager.getSetting("play-sound", true);
         playSoundButton.addEventListener("change", () => {
-            settingsManager.setSetting("play-sound", playSoundButton.checked);
+            settingsManager.setSetting("play-sound", (playSoundButton.checked)?"1":"0");
             soundManager.set({muted: !playSoundButton.checked}, SoundManager.CHANNELS.SOUND);
             Matomo.push(["trackEvent", "MainMenu", "PlaySound", "Play Sound", (playSoundButton.checked) ? 1 : 0]);
         });