From 405f7b11374e6dcbfd1fe069eb663bc9595fadb6 Mon Sep 17 00:00:00 2001
From: Lurkars <git@8lh.de>
Date: Tue, 20 Apr 2021 21:37:48 +0200
Subject: [PATCH 1/4] audio player volume improvements

---
 front/dist/index.tmpl.html           | 12 +++++++---
 front/dist/resources/style/style.css | 13 +++++++++++
 front/src/WebRtc/AudioManager.ts     | 34 +++++++++++++++++++---------
 3 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/front/dist/index.tmpl.html b/front/dist/index.tmpl.html
index 062622b8..2c3aef43 100644
--- a/front/dist/index.tmpl.html
+++ b/front/dist/index.tmpl.html
@@ -88,9 +88,15 @@
                         <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-volume-up" fill="white" xmlns="http://www.w3.org/2000/svg">
                             <path fill-rule="evenodd" d="M6.717 3.55A.5.5 0 0 1 7 4v8a.5.5 0 0 1-.812.39L3.825 10.5H1.5A.5.5 0 0 1 1 10V6a.5.5 0 0 1 .5-.5h2.325l2.363-1.89a.5.5 0 0 1 .529-.06zM6 5.04L4.312 6.39A.5.5 0 0 1 4 6.5H2v3h2a.5.5 0 0 1 .312.11L6 10.96V5.04z" />
                             <g id="audioplayer_volume_icon_playing">
-                                <path d="M11.536 14.01A8.473 8.473 0 0 0 14.026 8a8.473 8.473 0 0 0-2.49-6.01l-.708.707A7.476 7.476 0 0 1 13.025 8c0 2.071-.84 3.946-2.197 5.303l.708.707z" />
-                                <path d="M10.121 12.596A6.48 6.48 0 0 0 12.025 8a6.48 6.48 0 0 0-1.904-4.596l-.707.707A5.483 5.483 0 0 1 11.025 8a5.483 5.483 0 0 1-1.61 3.89l.706.706z" />
-                                <path d="M8.707 11.182A4.486 4.486 0 0 0 10.025 8a4.486 4.486 0 0 0-1.318-3.182L8 5.525A3.489 3.489 0 0 1 9.025 8 3.49 3.49 0 0 1 8 10.475l.707.707z" />
+                                <g id="audioplayer_volume_icon_playing_high">
+                                    <path d="M11.536 14.01A8.473 8.473 0 0 0 14.026 8a8.473 8.473 0 0 0-2.49-6.01l-.708.707A7.476 7.476 0 0 1 13.025 8c0 2.071-.84 3.946-2.197 5.303l.708.707z" />
+                                </g>
+                                <g id="audioplayer_volume_icon_playing_mid">
+                                    <path d="M10.121 12.596A6.48 6.48 0 0 0 12.025 8a6.48 6.48 0 0 0-1.904-4.596l-.707.707A5.483 5.483 0 0 1 11.025 8a5.483 5.483 0 0 1-1.61 3.89l.706.706z" />
+                                </g>
+                                <g id="audioplayer_volume_icon_playing_low">
+                                    <path d="M8.707 11.182A4.486 4.486 0 0 0 10.025 8a4.486 4.486 0 0 0-1.318-3.182L8 5.525A3.489 3.489 0 0 1 9.025 8 3.49 3.49 0 0 1 8 10.475l.707.707z" />
+                                </g>
                             </g>
                         </svg>
                     </button>
diff --git a/front/dist/resources/style/style.css b/front/dist/resources/style/style.css
index ff79245c..3ad0bdcf 100644
--- a/front/dist/resources/style/style.css
+++ b/front/dist/resources/style/style.css
@@ -403,6 +403,19 @@ body {
     visibility: hidden;
     display: none;
 }
+#audioplayer_volume_icon_playing.low #audioplayer_volume_icon_playing_high {
+    visibility: hidden;
+    display: none;
+}
+#audioplayer_volume_icon_playing.low #audioplayer_volume_icon_playing_mid {
+    visibility: hidden;
+    display: none;
+}
+#audioplayer_volume_icon_playing.mid #audioplayer_volume_icon_playing_high {
+    visibility: hidden;
+    display: none;
+}
+
 #audioplayerctrl > #audioplayer_volume {
     width: 100%;
     background-color: rgba(0,0,0,0.5);
diff --git a/front/src/WebRtc/AudioManager.ts b/front/src/WebRtc/AudioManager.ts
index 60255a77..753cf7fb 100644
--- a/front/src/WebRtc/AudioManager.ts
+++ b/front/src/WebRtc/AudioManager.ts
@@ -11,7 +11,7 @@ enum audioStates {
 const audioPlayerDivId = "audioplayer";
 const audioPlayerCtrlId = "audioplayerctrl";
 const audioPlayerVolId = "audioplayer_volume";
-const audioPlayerMuteId = "audioplayer_volume_icon_playing";
+const audioPlayerVolumeIconId = "audioplayer_volume_icon_playing";
 const animationTime = 500;
 
 class AudioManager {
@@ -21,7 +21,7 @@ class AudioManager {
     private audioPlayerCtrl: HTMLDivElement;
     private audioPlayerElem: HTMLAudioElement | undefined;
     private audioPlayerVol: HTMLInputElement;
-    private audioPlayerMute: HTMLInputElement;
+    private audioPlayerVolumeIcon: HTMLInputElement;
 
     private volume = 1;
     private muted = false;
@@ -32,14 +32,14 @@ class AudioManager {
         this.audioPlayerDiv = HtmlUtils.getElementByIdOrFail<HTMLDivElement>(audioPlayerDivId);
         this.audioPlayerCtrl = HtmlUtils.getElementByIdOrFail<HTMLDivElement>(audioPlayerCtrlId);
         this.audioPlayerVol = HtmlUtils.getElementByIdOrFail<HTMLInputElement>(audioPlayerVolId);
-        this.audioPlayerMute = HtmlUtils.getElementByIdOrFail<HTMLInputElement>(audioPlayerMuteId);
+        this.audioPlayerVolumeIcon = HtmlUtils.getElementByIdOrFail<HTMLInputElement>(audioPlayerVolumeIconId);
 
         this.volume = localUserStore.getAudioPlayerVolume();
         this.audioPlayerVol.value = '' + this.volume;
 
         this.muted = localUserStore.getAudioPlayerMuted();
         if (this.muted) {
-            this.audioPlayerMute.classList.add('muted');
+            this.audioPlayerVolumeIcon.classList.add('muted');
         }
     }
 
@@ -93,7 +93,23 @@ class AudioManager {
         this.volumeReduced = reduceVolume;
 
         this.audioPlayerElem.volume = this.volume;
-        this.audioPlayerVol.value = '' + this.volume;
+        if (this.muted) {
+            this.audioPlayerVolumeIcon.classList.add('muted');
+            this.audioPlayerVol.value = '0';
+        } else {
+            this.audioPlayerVol.value = '' + this.volume;
+            this.audioPlayerVolumeIcon.classList.remove('muted');
+            if (this.volume < 0.3) {
+                this.audioPlayerVolumeIcon.classList.add('low');
+            } else if (this.volume < 0.7) {
+                this.audioPlayerVolumeIcon.classList.remove('low');
+                this.audioPlayerVolumeIcon.classList.add('mid');
+            } else {
+                this.audioPlayerVolumeIcon.classList.remove('low');
+                this.audioPlayerVolumeIcon.classList.remove('mid');
+            }
+        }
+
         this.audioPlayerElem.muted = this.muted;
     }
 
@@ -129,16 +145,12 @@ class AudioManager {
             this.muted = !this.muted;
             this.changeVolume();
             localUserStore.setAudioPlayerMuted(this.muted);
-
-            if (this.muted) {
-                this.audioPlayerMute.classList.add('muted');
-            } else {
-                this.audioPlayerMute.classList.remove('muted');
-            }
         }
 
         this.audioPlayerVol.oninput = (ev: Event)=> {
             this.setVolume(parseFloat((<HTMLInputElement>ev.currentTarget).value));
+            this.muted = false;        
+            localUserStore.setAudioPlayerMuted(this.muted);
             this.changeVolume();
 
             (<HTMLInputElement>ev.currentTarget).blur();

From 3702173cd4b773ae9f988041a9e85e9dadcea24a Mon Sep 17 00:00:00 2001
From: Lurkars <git@8lh.de>
Date: Wed, 11 Aug 2021 20:01:51 +0200
Subject: [PATCH 2/4] migrate to svelte

---
 .../AudioManager/AudioManager.svelte          | 127 ++++++++++++++----
 1 file changed, 98 insertions(+), 29 deletions(-)

diff --git a/front/src/Components/AudioManager/AudioManager.svelte b/front/src/Components/AudioManager/AudioManager.svelte
index a78b4bde..6d59b995 100644
--- a/front/src/Components/AudioManager/AudioManager.svelte
+++ b/front/src/Components/AudioManager/AudioManager.svelte
@@ -1,6 +1,4 @@
 <script lang="ts">
-    import audioImg from "../images/audio.svg";
-    import audioMuteImg from  "../images/audio-mute.svg";
     import { localUserStore } from "../../Connexion/LocalUserStore";
     import type { audioManagerVolume } from "../../Stores/AudioManagerStore";
     import {
@@ -12,6 +10,8 @@
     import {onDestroy, onMount} from "svelte";
 
     let HTMLAudioPlayer: HTMLAudioElement;
+    let audioPlayerVolumeIcon: HTMLElement;
+    let audioPlayerVol: HTMLInputElement;
     let unsubscriberFileStore: Unsubscriber | null = null;
     let unsubscriberVolumeStore: Unsubscriber | null = null;
 
@@ -52,9 +52,26 @@
     function onMute() {
         audioManagerVolumeStore.setMuted(!get(audioManagerVolumeStore).muted);
         localUserStore.setAudioPlayerMuted(get(audioManagerVolumeStore).muted);
+        setVolume();
     }
 
     function setVolume() {
+        if (get(audioManagerVolumeStore).muted) {
+            audioPlayerVolumeIcon.classList.add('muted');
+            audioPlayerVol.value = "0";
+        } else {
+            audioPlayerVol.value = "" + volume;
+            audioPlayerVolumeIcon.classList.remove('muted');
+            if (volume < 0.3) {
+                audioPlayerVolumeIcon.classList.add('low');
+            } else if (volume < 0.7) {
+                audioPlayerVolumeIcon.classList.remove('low');
+                audioPlayerVolumeIcon.classList.add('mid');
+            } else {
+                audioPlayerVolumeIcon.classList.remove('low');
+                audioPlayerVolumeIcon.classList.remove('mid');
+            }
+        }
         audioManagerVolumeStore.setVolume(volume)
         localUserStore.setAudioPlayerVolume(get(audioManagerVolumeStore).volume);
     }
@@ -67,8 +84,28 @@
 
 <div class="main-audio-manager nes-container is-rounded">
     <div class="audio-manager-player-volume">
-        <img src={$audioManagerVolumeStore.muted ? audioMuteImg : audioImg} alt="player volume" on:click={onMute}>
-        <input type="range" min="0" max="1" step="0.025" bind:value={volume} on:change={setVolume}>
+        <span id="audioplayer_volume_icon_playing" alt="player volume" bind:this={audioPlayerVolumeIcon}
+            on:click={onMute}>
+            <svg width="2em" height="2em" viewBox="0 0 16 16" class="bi bi-volume-up" fill="white"
+                xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd"
+                    d="M6.717 3.55A.5.5 0 0 1 7 4v8a.5.5 0 0 1-.812.39L3.825 10.5H1.5A.5.5 0 0 1 1 10V6a.5.5 0 0 1 .5-.5h2.325l2.363-1.89a.5.5 0 0 1 .529-.06zM6 5.04L4.312 6.39A.5.5 0 0 1 4 6.5H2v3h2a.5.5 0 0 1 .312.11L6 10.96V5.04z" />
+                <g id="audioplayer_volume_icon_playing_high">
+                    <path
+                        d="M11.536 14.01A8.473 8.473 0 0 0 14.026 8a8.473 8.473 0 0 0-2.49-6.01l-.708.707A7.476 7.476 0 0 1 13.025 8c0 2.071-.84 3.946-2.197 5.303l.708.707z" />
+                </g>
+                <g id="audioplayer_volume_icon_playing_mid">
+                    <path
+                        d="M10.121 12.596A6.48 6.48 0 0 0 12.025 8a6.48 6.48 0 0 0-1.904-4.596l-.707.707A5.483 5.483 0 0 1 11.025 8a5.483 5.483 0 0 1-1.61 3.89l.706.706z" />
+                </g>
+                <g id="audioplayer_volume_icon_playing_low">
+                    <path
+                        d="M8.707 11.182A4.486 4.486 0 0 0 10.025 8a4.486 4.486 0 0 0-1.318-3.182L8 5.525A3.489 3.489 0 0 1 9.025 8 3.49 3.49 0 0 1 8 10.475l.707.707z" />
+                </g>
+            </svg>
+        </span>
+        <input type="range" min="0" max="1" step="0.025" bind:value={volume} bind:this={audioPlayerVol}
+            on:change={setVolume}>
     </div>
     <div class="audio-manager-reduce-conversation">
         <label>
@@ -86,34 +123,66 @@
 
 <style lang="scss">
     div.main-audio-manager.nes-container.is-rounded {
-      position: relative;
-      top: 0.5rem;
-      max-height: clamp(150px, 10vh, 15vh); //replace @media for small screen
-      width: clamp(200px, 15vw, 15vw);
-      padding: 3px 3px;
-      margin-left: auto;
-      margin-right: auto;
+        position: relative;
+        top: 0.5rem;
+        max-height: clamp(150px, 10vh, 15vh); //replace @media for small screen
+        width: clamp(200px, 15vw, 15vw);
+        padding: 3px 3px;
+        margin-left: auto;
+        margin-right: auto;
 
-      background-color: rgb(0,0,0,0.5);
-      display: grid;
-      grid-template-rows: 50% 50%;
-      color: whitesmoke;
-      text-align: center;
-      pointer-events: auto;
-
-      div.audio-manager-player-volume {
+        background-color: rgb(0,0,0,0.5);
         display: grid;
-        grid-template-columns: 50px 1fr;
+        grid-template-rows: 50% 50%;
+        color: whitesmoke;
+        text-align: center;
+        pointer-events: auto;
 
-        img {
-          height: 100%;
-          width: calc(100% - 10px);
-          margin-right: 10px;
+        div.audio-manager-player-volume {
+            display: grid;
+            grid-template-columns: 50px 1fr;
+
+            span svg {
+                height: 100%;
+                width: calc(100% - 10px);
+                margin-right: 10px;
+            }
         }
-      }
 
-      section.audio-manager-file {
-        display: none;
-      }
+        section.audio-manager-file {
+            display: none;
+        }
+
+        #audioplayer_volume_icon_playing.muted {
+            #audioplayer_volume_icon_playing_low {
+                visibility: hidden;
+                display: none;
+            }
+
+            #audioplayer_volume_icon_playing_mid {
+                visibility: hidden;
+                display: none;
+            }
+
+            #audioplayer_volume_icon_playing_high {
+                visibility: hidden;
+                display: none;
+            }
+        }
+
+        #audioplayer_volume_icon_playing.low #audioplayer_volume_icon_playing_high {
+            visibility: hidden;
+            display: none;
+        }
+
+        #audioplayer_volume_icon_playing.low #audioplayer_volume_icon_playing_mid {
+            visibility: hidden;
+            display: none;
+        }
+
+        #audioplayer_volume_icon_playing.mid #audioplayer_volume_icon_playing_high {
+            visibility: hidden;
+            display: none;
+        }
     }
-</style>
+</style>
\ No newline at end of file

From 0d27b4ad430a55133a4157bbd6b2a4c7ec57c0ad Mon Sep 17 00:00:00 2001
From: Lurkars <git@8lh.de>
Date: Wed, 11 Aug 2021 20:07:09 +0200
Subject: [PATCH 3/4] remove redundancy

---
 front/dist/index.tmpl.html | 31 -----------------
 front/style/style.scss     | 69 --------------------------------------
 2 files changed, 100 deletions(-)

diff --git a/front/dist/index.tmpl.html b/front/dist/index.tmpl.html
index 4c4469b4..13bb6e0b 100644
--- a/front/dist/index.tmpl.html
+++ b/front/dist/index.tmpl.html
@@ -62,37 +62,6 @@
                     <img src="resources/logos/close.svg"/>
                 </button>
             </div>
-
-            <div id="audioplayerctrl" class="hidden">
-                <div class="audioplayer">
-                    <button type="button" id="audioplayer_mute" class="fa fa-volump-up">
-                        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-volume-up" fill="white" xmlns="http://www.w3.org/2000/svg">
-                            <path fill-rule="evenodd" d="M6.717 3.55A.5.5 0 0 1 7 4v8a.5.5 0 0 1-.812.39L3.825 10.5H1.5A.5.5 0 0 1 1 10V6a.5.5 0 0 1 .5-.5h2.325l2.363-1.89a.5.5 0 0 1 .529-.06zM6 5.04L4.312 6.39A.5.5 0 0 1 4 6.5H2v3h2a.5.5 0 0 1 .312.11L6 10.96V5.04z" />
-                            <g id="audioplayer_volume_icon_playing">
-                                <g id="audioplayer_volume_icon_playing_high">
-                                    <path d="M11.536 14.01A8.473 8.473 0 0 0 14.026 8a8.473 8.473 0 0 0-2.49-6.01l-.708.707A7.476 7.476 0 0 1 13.025 8c0 2.071-.84 3.946-2.197 5.303l.708.707z" />
-                                </g>
-                                <g id="audioplayer_volume_icon_playing_mid">
-                                    <path d="M10.121 12.596A6.48 6.48 0 0 0 12.025 8a6.48 6.48 0 0 0-1.904-4.596l-.707.707A5.483 5.483 0 0 1 11.025 8a5.483 5.483 0 0 1-1.61 3.89l.706.706z" />
-                                </g>
-                                <g id="audioplayer_volume_icon_playing_low">
-                                    <path d="M8.707 11.182A4.486 4.486 0 0 0 10.025 8a4.486 4.486 0 0 0-1.318-3.182L8 5.525A3.489 3.489 0 0 1 9.025 8 3.49 3.49 0 0 1 8 10.475l.707.707z" />
-                                </g>
-                            </g>
-                        </svg>
-                    </button>
-                    <div class="audioplayer">
-                        <input type="range" id="audioplayer_volume" min="0" max="1" step="0.025" value="1" />
-                    </div>
-                </div>
-                <div class="audioplayer">
-                    <label id="label-audioplayer_decrease_while_talking" for="audioplayer_decrease_while_talking" title="decrease background volume by 50% when entering conversations">
-                        reduce in conversations
-                        <input type="checkbox" id="audioplayer_decrease_while_talking" checked />
-                    </label>
-                    <div id="audioplayer" style="visibility: hidden"></div>
-                </div>
-            </div>
         </div>
 
         <div id="activeScreenSharing" class="active-screen-sharing active">
diff --git a/front/style/style.scss b/front/style/style.scss
index a73aca9e..36cb68ef 100644
--- a/front/style/style.scss
+++ b/front/style/style.scss
@@ -400,75 +400,6 @@ body {
     }
 }
 
-.audioplayer:first-child  {
-    display: grid;
-    grid: 2rem / 4rem 10rem;
-}
-
-.audioplayer > button, .audioplayer > div, .audioplayer > label {
-    background-color: rgba(0,0,0,0.5);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.audioplayer > div {
-    padding-right: 1.2rem;
-}
-
-#audioplayerctrl {
-    position: fixed;
-    top: 0;
-    right: calc(50% - 120px);
-    padding: 0.3rem 0.5rem;
-    color: white;
-    transition: transform 0.5s;
-}
-
-#audioplayer_mute {
-    max-width: 5rem;
-    border: none;
-}
-#audioplayer_mute:focus, #audioplayer_mute:active {
-    outline: none;
-}
-#audioplayer_mute > svg {
-    width: 100%;
-    height: 100%;
-    pointer-events: none;
-}
-#audioplayer_volume_icon_playing.muted {
-    visibility: hidden;
-    display: none;
-}
-#audioplayer_volume_icon_playing.low #audioplayer_volume_icon_playing_high {
-    visibility: hidden;
-    display: none;
-}
-#audioplayer_volume_icon_playing.low #audioplayer_volume_icon_playing_mid {
-    visibility: hidden;
-    display: none;
-}
-#audioplayer_volume_icon_playing.mid #audioplayer_volume_icon_playing_high {
-    visibility: hidden;
-    display: none;
-}
-
-#audioplayerctrl > #audioplayer_volume {
-    width: 100%;
-    background-color: rgba(0,0,0,0.5);
-}
-
-/*
- * sollte eigentlich in den aspect-ratio teil ..
- */
-#audioplayerctrl.loading {
-    transform: translateY(-90%);
-}
-#audioplayerctrl.hidden {
-    transform: translateY(-100%);
-}
-
 /*
  * Style Input Range
  * https://www.cssportal.com/style-input-range/

From aa38d1a5bd476b1c09d0360014a994079aa6263d Mon Sep 17 00:00:00 2001
From: Lurkars <git@8lh.de>
Date: Wed, 11 Aug 2021 20:29:48 +0200
Subject: [PATCH 4/4] initial localUserStore volume

---
 front/src/Components/AudioManager/AudioManager.svelte | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/front/src/Components/AudioManager/AudioManager.svelte b/front/src/Components/AudioManager/AudioManager.svelte
index 6d59b995..a448d56c 100644
--- a/front/src/Components/AudioManager/AudioManager.svelte
+++ b/front/src/Components/AudioManager/AudioManager.svelte
@@ -19,6 +19,10 @@
     let decreaseWhileTalking: boolean = true;
 
     onMount(() => {
+        volume = localUserStore.getAudioPlayerVolume();
+        audioManagerVolumeStore.setMuted(localUserStore.getAudioPlayerMuted());
+        setVolume();
+
         unsubscriberFileStore = audioManagerFileStore.subscribe(() =>{
             HTMLAudioPlayer.pause();
             HTMLAudioPlayer.loop = get(audioManagerVolumeStore).loop;