From 4dcb0fa658458f77f43563e9f098831fffb49aba Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Fri, 4 Aug 2023 17:45:59 +0100
Subject: [PATCH 01/15] Add options for album gain

---
 src/components/playbackSettings/playbackSettings.js |  4 ++--
 .../playbackSettings/playbackSettings.template.html | 13 +++++++++++--
 src/plugins/htmlAudioPlayer/plugin.js               |  5 ++++-
 src/scripts/settings/userSettings.js                | 10 +++++-----
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/components/playbackSettings/playbackSettings.js b/src/components/playbackSettings/playbackSettings.js
index 0e3a798b653..c152c4f21ac 100644
--- a/src/components/playbackSettings/playbackSettings.js
+++ b/src/components/playbackSettings/playbackSettings.js
@@ -173,7 +173,7 @@ function loadForm(context, user, userSettings, apiClient) {
     context.querySelector('.chkPlayDefaultAudioTrack').checked = user.Configuration.PlayDefaultAudioTrack || false;
     context.querySelector('.chkPreferFmp4HlsContainer').checked = userSettings.preferFmp4HlsContainer();
     context.querySelector('.chkEnableCinemaMode').checked = userSettings.enableCinemaMode();
-    context.querySelector('.chkEnableAudioNormalization').checked = userSettings.enableAudioNormalization();
+    context.querySelector('#selectAudioNormalization').checked = userSettings.audioNormalization();
     context.querySelector('.chkEnableNextVideoOverlay').checked = userSettings.enableNextVideoInfoOverlay();
     context.querySelector('.chkRememberAudioSelections').checked = user.Configuration.RememberAudioSelections || false;
     context.querySelector('.chkRememberSubtitleSelections').checked = user.Configuration.RememberSubtitleSelections || false;
@@ -218,7 +218,7 @@ function saveUser(context, user, userSettingsInstance, apiClient) {
     user.Configuration.EnableNextEpisodeAutoPlay = context.querySelector('.chkEpisodeAutoPlay').checked;
     userSettingsInstance.preferFmp4HlsContainer(context.querySelector('.chkPreferFmp4HlsContainer').checked);
     userSettingsInstance.enableCinemaMode(context.querySelector('.chkEnableCinemaMode').checked);
-    userSettingsInstance.enableAudioNormalization(context.querySelector('.chkEnableAudioNormalization').checked);
+    userSettingsInstance.audioNormalization(context.querySelector('#selectAudioNormalization').checked);
     userSettingsInstance.enableNextVideoInfoOverlay(context.querySelector('.chkEnableNextVideoOverlay').checked);
     user.Configuration.RememberAudioSelections = context.querySelector('.chkRememberAudioSelections').checked;
     user.Configuration.RememberSubtitleSelections = context.querySelector('.chkRememberSubtitleSelections').checked;
diff --git a/src/components/playbackSettings/playbackSettings.template.html b/src/components/playbackSettings/playbackSettings.template.html
index 44dfe85e0b5..29803fad833 100644
--- a/src/components/playbackSettings/playbackSettings.template.html
+++ b/src/components/playbackSettings/playbackSettings.template.html
@@ -72,13 +72,22 @@ <h2 class="sectionTitle">
             ${TabAdvanced}
         </h2>
 
-        <div class="checkboxContainer checkboxContainer-withDescription">
+        <div class="selectContainer">
+            <select is="emby-select" id="selectAudioNormalization" label="${LabelStereoDownmixAlgorithm}">
+                <option value="Off">${None}</option>
+                <option value="TrackGain">TrackGain</option>
+                <option value="AlbumGain">AlbumGain</option>
+            </select>
+            <div class="fieldDescription">${StereoDownmixAlgorithmHelp}</div>
+        </div>
+
+        <!-- <div class="checkboxContainer checkboxContainer-withDescription">
             <label>
                 <input type="checkbox" is="emby-checkbox" class="chkEnableAudioNormalization" />
                 <span>${EnableAudioNormalization}</span>
             </label>
             <div class="fieldDescription checkboxFieldDescription">${EnableAudioNormalizationHelp}</div>
-        </div>
+        </div> -->
 
         <div class="checkboxContainer checkboxContainer-withDescription">
             <label>
diff --git a/src/plugins/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js
index 2742e8d8cce..5cb8385f201 100644
--- a/src/plugins/htmlAudioPlayer/plugin.js
+++ b/src/plugins/htmlAudioPlayer/plugin.js
@@ -112,9 +112,12 @@ class HtmlAudioPlayer {
             let val = options.url;
             console.debug('playing url: ' + val);
             import('../../scripts/settings/userSettings').then((userSettings) => {
-                if (userSettings.enableAudioNormalization() && options.item.LUFS != null) {
+                if (userSettings.udioNormalization() == "TrackGain" && options.item.LUFS != null) {
                     const dbGain = -18 - options.item.LUFS;
                     self.gainNode.gain.value = Math.pow(10, (dbGain / 20));
+                } else if (userSettings.AudioNormalization == "AlbumGain" && options.item.LUFSAlbum != null) {
+                    const dbGain = -18 - options.item.LUFSAlbum;
+                    self.gainNode.gain.value = Math.pow(10, (dbGain / 20));
                 } else {
                     self.gainNode.gain.value = 1;
                 }
diff --git a/src/scripts/settings/userSettings.js b/src/scripts/settings/userSettings.js
index 9dc0656219f..3cf9c841b91 100644
--- a/src/scripts/settings/userSettings.js
+++ b/src/scripts/settings/userSettings.js
@@ -158,15 +158,15 @@ export class UserSettings {
 
     /**
      * Get or set 'Enable Audio Normalization' state.
-     * @param {boolean|undefined} val - Flag to enable 'Enable Audio Normalization' or undefined.
-     * @return {boolean} 'Enable Audio Normalization' state.
+     * @param {string|undefined} val - Flag to enable 'Enable Audio Normalization' or undefined.
+     * @return {string} 'Enable Audio Normalization' state.
      */
-    enableAudioNormalization(val) {
+    audioNormalization(val) {
         if (val !== undefined) {
-            return this.set('enableAudioNormalization', val.toString(), false);
+            return this.set('selectAudioNormalization', val, false);
         }
 
-        return toBoolean(this.get('enableAudioNormalization', false), true);
+        return this.get('selectAudioNormalization', false) || "TrackGain";
     }
 
     /**

From 62cd0c39facefa0de44e44a349de402628c32a8a Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Fri, 4 Aug 2023 18:20:09 +0100
Subject: [PATCH 02/15] change to value instead of checked

---
 src/components/playbackSettings/playbackSettings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/playbackSettings/playbackSettings.js b/src/components/playbackSettings/playbackSettings.js
index c152c4f21ac..aa02c1ed228 100644
--- a/src/components/playbackSettings/playbackSettings.js
+++ b/src/components/playbackSettings/playbackSettings.js
@@ -173,7 +173,7 @@ function loadForm(context, user, userSettings, apiClient) {
     context.querySelector('.chkPlayDefaultAudioTrack').checked = user.Configuration.PlayDefaultAudioTrack || false;
     context.querySelector('.chkPreferFmp4HlsContainer').checked = userSettings.preferFmp4HlsContainer();
     context.querySelector('.chkEnableCinemaMode').checked = userSettings.enableCinemaMode();
-    context.querySelector('#selectAudioNormalization').checked = userSettings.audioNormalization();
+    context.querySelector('#selectAudioNormalization').value = userSettings.selectAudioNormalization();
     context.querySelector('.chkEnableNextVideoOverlay').checked = userSettings.enableNextVideoInfoOverlay();
     context.querySelector('.chkRememberAudioSelections').checked = user.Configuration.RememberAudioSelections || false;
     context.querySelector('.chkRememberSubtitleSelections').checked = user.Configuration.RememberSubtitleSelections || false;
@@ -218,7 +218,7 @@ function saveUser(context, user, userSettingsInstance, apiClient) {
     user.Configuration.EnableNextEpisodeAutoPlay = context.querySelector('.chkEpisodeAutoPlay').checked;
     userSettingsInstance.preferFmp4HlsContainer(context.querySelector('.chkPreferFmp4HlsContainer').checked);
     userSettingsInstance.enableCinemaMode(context.querySelector('.chkEnableCinemaMode').checked);
-    userSettingsInstance.audioNormalization(context.querySelector('#selectAudioNormalization').checked);
+    userSettingsInstance.selectAudioNormalization(context.querySelector('#selectAudioNormalization').value);
     userSettingsInstance.enableNextVideoInfoOverlay(context.querySelector('.chkEnableNextVideoOverlay').checked);
     user.Configuration.RememberAudioSelections = context.querySelector('.chkRememberAudioSelections').checked;
     user.Configuration.RememberSubtitleSelections = context.querySelector('.chkRememberSubtitleSelections').checked;

From eda888ede1df6f45610cc85c4e53b75dd66d4c9f Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Fri, 4 Aug 2023 18:20:30 +0100
Subject: [PATCH 03/15] Add spacing for html

---
 .../playbackSettings/playbackSettings.template.html    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/playbackSettings/playbackSettings.template.html b/src/components/playbackSettings/playbackSettings.template.html
index 29803fad833..3818b4117a8 100644
--- a/src/components/playbackSettings/playbackSettings.template.html
+++ b/src/components/playbackSettings/playbackSettings.template.html
@@ -73,12 +73,12 @@ <h2 class="sectionTitle">
         </h2>
 
         <div class="selectContainer">
-            <select is="emby-select" id="selectAudioNormalization" label="${LabelStereoDownmixAlgorithm}">
-                <option value="Off">${None}</option>
-                <option value="TrackGain">TrackGain</option>
-                <option value="AlbumGain">AlbumGain</option>
+            <select is="emby-select" id="selectAudioNormalization" label="${LabelSelectAudioNormalization}">
+                <option value="Off">Off</option>
+                <option value="TrackGain">Track Gain</option>
+                <option value="AlbumGain">Album Gain</option>
             </select>
-            <div class="fieldDescription">${StereoDownmixAlgorithmHelp}</div>
+            <div class="fieldDescription">${SelectAudioNormalizationHelp}</div>
         </div>
 
         <!-- <div class="checkboxContainer checkboxContainer-withDescription">

From 88e925686bd746874d841875f647e3ab9958a6a4 Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Fri, 4 Aug 2023 18:20:51 +0100
Subject: [PATCH 04/15] Fix typo

---
 src/plugins/htmlAudioPlayer/plugin.js | 7 +++++--
 src/scripts/settings/userSettings.js  | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/plugins/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js
index 5cb8385f201..3c65e11565c 100644
--- a/src/plugins/htmlAudioPlayer/plugin.js
+++ b/src/plugins/htmlAudioPlayer/plugin.js
@@ -112,12 +112,15 @@ class HtmlAudioPlayer {
             let val = options.url;
             console.debug('playing url: ' + val);
             import('../../scripts/settings/userSettings').then((userSettings) => {
-                if (userSettings.udioNormalization() == "TrackGain" && options.item.LUFS != null) {
+                console.debug(userSettings.selectAudioNormalization());
+                if (userSettings.selectAudioNormalization() == "TrackGain" && options.item.LUFS != null) {
                     const dbGain = -18 - options.item.LUFS;
                     self.gainNode.gain.value = Math.pow(10, (dbGain / 20));
-                } else if (userSettings.AudioNormalization == "AlbumGain" && options.item.LUFSAlbum != null) {
+                    console.debug("using trackgain")
+                } else if (userSettings.selectAudioNormalization() == "AlbumGain" && options.item.LUFSAlbum != null) {
                     const dbGain = -18 - options.item.LUFSAlbum;
                     self.gainNode.gain.value = Math.pow(10, (dbGain / 20));
+                    console.debug("using albumgain")
                 } else {
                     self.gainNode.gain.value = 1;
                 }
diff --git a/src/scripts/settings/userSettings.js b/src/scripts/settings/userSettings.js
index 3cf9c841b91..b487f90162c 100644
--- a/src/scripts/settings/userSettings.js
+++ b/src/scripts/settings/userSettings.js
@@ -161,12 +161,12 @@ export class UserSettings {
      * @param {string|undefined} val - Flag to enable 'Enable Audio Normalization' or undefined.
      * @return {string} 'Enable Audio Normalization' state.
      */
-    audioNormalization(val) {
+    selectAudioNormalization(val) {
         if (val !== undefined) {
             return this.set('selectAudioNormalization', val, false);
         }
 
-        return this.get('selectAudioNormalization', false) || "TrackGain";
+        return this.get('selectAudioNormalization', false);
     }
 
     /**
@@ -636,7 +636,7 @@ export const serverConfig = currentSettings.serverConfig.bind(currentSettings);
 export const allowedAudioChannels = currentSettings.allowedAudioChannels.bind(currentSettings);
 export const preferFmp4HlsContainer = currentSettings.preferFmp4HlsContainer.bind(currentSettings);
 export const enableCinemaMode = currentSettings.enableCinemaMode.bind(currentSettings);
-export const enableAudioNormalization = currentSettings.enableAudioNormalization.bind(currentSettings);
+export const selectAudioNormalization = currentSettings.selectAudioNormalization.bind(currentSettings);
 export const enableNextVideoInfoOverlay = currentSettings.enableNextVideoInfoOverlay.bind(currentSettings);
 export const enableVideoRemainingTime = currentSettings.enableVideoRemainingTime.bind(currentSettings);
 export const enableThemeSongs = currentSettings.enableThemeSongs.bind(currentSettings);

From bbdb3ac6e593a1c70cc09c820881d6d5df3946f0 Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Fri, 4 Aug 2023 18:20:59 +0100
Subject: [PATCH 05/15] Add strings

---
 src/strings/en-us.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 46ac5869511..42c8dcbd5b4 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -138,7 +138,7 @@
     "ChannelNumber": "Channel number",
     "Channels": "Channels",
     "CinemaModeConfigurationHelp": "Cinema mode brings the theater experience straight to your living room with the ability to play trailers and custom intros before the main feature.",
-    "EnableAudioNormalizationHelp": "Audio normalization will add a constant gain to keep the average at a desired level (-18dB).",
+    "SelectAudioNormalizationHelp": "Track gain - adjusts the volume of each track so they playback with the same loudness. Album gain - adjusts the volume of all the tracks in an album only, keeping the albums dynamic range.",
     "ClearQueue": "Clear queue",
     "ClientSettings": "Client Settings",
     "Collections": "Collections",
@@ -226,7 +226,6 @@
     "EnableBlurHash": "Enable blurred placeholders for images",
     "EnableBlurHashHelp": "Images that are still being loaded will be displayed with a unique placeholder.",
     "EnableCinemaMode": "Cinema mode",
-    "EnableAudioNormalization": "Audio Normalization",
     "EnableColorCodedBackgrounds": "Color coded backgrounds",
     "EnableDecodingColorDepth10Hevc": "Enable 10-bit hardware decoding for HEVC",
     "EnableDecodingColorDepth10Vp9": "Enable 10-bit hardware decoding for VP9",
@@ -561,6 +560,7 @@
     "LabelAudioChannels": "Audio channels",
     "LabelAudioCodec": "Audio codec",
     "LabelAudioLanguagePreference": "Preferred audio language",
+    "LabelSelectAudioNormalization": "Audio Normalization",
     "LabelAudioSampleRate": "Audio sample rate",
     "LabelAuthProvider": "Authentication Provider",
     "LabelAutomaticallyAddToCollection": "Automatically add to collection",

From 7d1693208172d0a1183668cf63eb7d3506fcdcb2 Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Sat, 5 Aug 2023 13:45:46 +0100
Subject: [PATCH 06/15] Change to single quotes

---
 src/plugins/htmlAudioPlayer/plugin.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js
index 3c65e11565c..af927546a88 100644
--- a/src/plugins/htmlAudioPlayer/plugin.js
+++ b/src/plugins/htmlAudioPlayer/plugin.js
@@ -113,14 +113,14 @@ class HtmlAudioPlayer {
             console.debug('playing url: ' + val);
             import('../../scripts/settings/userSettings').then((userSettings) => {
                 console.debug(userSettings.selectAudioNormalization());
-                if (userSettings.selectAudioNormalization() == "TrackGain" && options.item.LUFS != null) {
+                if (userSettings.selectAudioNormalization() == 'TrackGain' && options.item.LUFS != null) {
                     const dbGain = -18 - options.item.LUFS;
                     self.gainNode.gain.value = Math.pow(10, (dbGain / 20));
-                    console.debug("using trackgain")
-                } else if (userSettings.selectAudioNormalization() == "AlbumGain" && options.item.LUFSAlbum != null) {
+                    console.debug('using trackgain');
+                } else if (userSettings.selectAudioNormalization() == 'AlbumGain' && options.item.LUFSAlbum != null) {
                     const dbGain = -18 - options.item.LUFSAlbum;
                     self.gainNode.gain.value = Math.pow(10, (dbGain / 20));
-                    console.debug("using albumgain")
+                    console.debug('using albumgain');
                 } else {
                     self.gainNode.gain.value = 1;
                 }

From 44e77011eb112327814dfbb8b70e6e060bf0180d Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Sat, 5 Aug 2023 14:21:18 +0100
Subject: [PATCH 07/15] Add default for normalization

---
 src/scripts/settings/userSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/settings/userSettings.js b/src/scripts/settings/userSettings.js
index b487f90162c..d305c5469be 100644
--- a/src/scripts/settings/userSettings.js
+++ b/src/scripts/settings/userSettings.js
@@ -166,7 +166,7 @@ export class UserSettings {
             return this.set('selectAudioNormalization', val, false);
         }
 
-        return this.get('selectAudioNormalization', false);
+        return this.get('selectAudioNormalization', false) || 'TrackGain';
     }
 
     /**

From 01dc72924adbe7be7756b5f62d4fd79ed9fdef76 Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Sat, 5 Aug 2023 14:22:29 +0100
Subject: [PATCH 08/15] Remove debugging

---
 src/plugins/htmlAudioPlayer/plugin.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/plugins/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js
index af927546a88..bb348cc8d09 100644
--- a/src/plugins/htmlAudioPlayer/plugin.js
+++ b/src/plugins/htmlAudioPlayer/plugin.js
@@ -112,15 +112,14 @@ class HtmlAudioPlayer {
             let val = options.url;
             console.debug('playing url: ' + val);
             import('../../scripts/settings/userSettings').then((userSettings) => {
-                console.debug(userSettings.selectAudioNormalization());
                 if (userSettings.selectAudioNormalization() == 'TrackGain' && options.item.LUFS != null) {
                     const dbGain = -18 - options.item.LUFS;
                     self.gainNode.gain.value = Math.pow(10, (dbGain / 20));
-                    console.debug('using trackgain');
+                    console.debug('Using track gain');
                 } else if (userSettings.selectAudioNormalization() == 'AlbumGain' && options.item.LUFSAlbum != null) {
                     const dbGain = -18 - options.item.LUFSAlbum;
                     self.gainNode.gain.value = Math.pow(10, (dbGain / 20));
-                    console.debug('using albumgain');
+                    console.debug('Using album gain');
                 } else {
                     self.gainNode.gain.value = 1;
                 }

From 28558ce6e4968174a99fd83e1c012fc483f8a6b5 Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Fri, 11 Aug 2023 21:09:09 +0100
Subject: [PATCH 09/15] Add albumLUFS to mediaSource to prevent new DTO

---
 src/components/playback/playbackmanager.js | 5 ++++-
 src/plugins/htmlAudioPlayer/plugin.js      | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index 05117fd08d9..7bf4374922a 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -2723,7 +2723,10 @@ class PlaybackManager {
                                     });
                                 });
                             } else {
-                                return mediaSource;
+                                return apiClient.getItem(apiClient.getCurrentUserId(), item.AlbumId).then(function(result) {
+                                    mediaSource.albumLUFS = result.LUFS;
+                                    return mediaSource;
+                                });
                             }
                         } else {
                             showPlaybackInfoErrorMessage(self, 'PlaybackErrorNoCompatibleStream');
diff --git a/src/plugins/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js
index bb348cc8d09..8271f240d4e 100644
--- a/src/plugins/htmlAudioPlayer/plugin.js
+++ b/src/plugins/htmlAudioPlayer/plugin.js
@@ -116,8 +116,8 @@ class HtmlAudioPlayer {
                     const dbGain = -18 - options.item.LUFS;
                     self.gainNode.gain.value = Math.pow(10, (dbGain / 20));
                     console.debug('Using track gain');
-                } else if (userSettings.selectAudioNormalization() == 'AlbumGain' && options.item.LUFSAlbum != null) {
-                    const dbGain = -18 - options.item.LUFSAlbum;
+                } else if (userSettings.selectAudioNormalization() == 'AlbumGain' && options.mediaSource.albumLUFS != null) {
+                    const dbGain = -18 - options.mediaSource.albumLUFS;
                     self.gainNode.gain.value = Math.pow(10, (dbGain / 20));
                     console.debug('Using album gain');
                 } else {

From f09dec63cd6eaa2b6ef147b3effe27a79223725c Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Fri, 11 Aug 2023 21:23:14 +0100
Subject: [PATCH 10/15] Remove commended out code

---
 .../playbackSettings/playbackSettings.template.html       | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/components/playbackSettings/playbackSettings.template.html b/src/components/playbackSettings/playbackSettings.template.html
index 3818b4117a8..a3b0925261e 100644
--- a/src/components/playbackSettings/playbackSettings.template.html
+++ b/src/components/playbackSettings/playbackSettings.template.html
@@ -81,14 +81,6 @@ <h2 class="sectionTitle">
             <div class="fieldDescription">${SelectAudioNormalizationHelp}</div>
         </div>
 
-        <!-- <div class="checkboxContainer checkboxContainer-withDescription">
-            <label>
-                <input type="checkbox" is="emby-checkbox" class="chkEnableAudioNormalization" />
-                <span>${EnableAudioNormalization}</span>
-            </label>
-            <div class="fieldDescription checkboxFieldDescription">${EnableAudioNormalizationHelp}</div>
-        </div> -->
-
         <div class="checkboxContainer checkboxContainer-withDescription">
             <label>
                 <input type="checkbox" is="emby-checkbox" class="chkPreferFmp4HlsContainer" />

From c47c1cacb209a3cefb9add83e6c392800fa31fcf Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Sat, 12 Aug 2023 10:28:23 +0100
Subject: [PATCH 11/15] Add check to get albumlufs only for music

---
 src/components/playback/playbackmanager.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index 7bf4374922a..8c6de9c96d1 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -2723,10 +2723,14 @@ class PlaybackManager {
                                     });
                                 });
                             } else {
-                                return apiClient.getItem(apiClient.getCurrentUserId(), item.AlbumId).then(function(result) {
-                                    mediaSource.albumLUFS = result.LUFS;
+                                if (item.AlbumId != null) {
+                                    return apiClient.getItem(apiClient.getCurrentUserId(), item.AlbumId).then(function(result) {
+                                        mediaSource.albumLUFS = result.LUFS;
+                                        return mediaSource;
+                                    });
+                                } else {
                                     return mediaSource;
-                                });
+                                }
                             }
                         } else {
                             showPlaybackInfoErrorMessage(self, 'PlaybackErrorNoCompatibleStream');

From b1c46157da1c45c9ab0dede046c3ef2e7c5bb69a Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Sat, 12 Aug 2023 10:33:19 +0100
Subject: [PATCH 12/15] Remove redundent else

---
 src/components/playback/playbackmanager.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index 8c6de9c96d1..d7eac0a2de8 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -2728,9 +2728,8 @@ class PlaybackManager {
                                         mediaSource.albumLUFS = result.LUFS;
                                         return mediaSource;
                                     });
-                                } else {
-                                    return mediaSource;
                                 }
+                                return mediaSource;
                             }
                         } else {
                             showPlaybackInfoErrorMessage(self, 'PlaybackErrorNoCompatibleStream');

From 743479cd530e80773bfb5a31b256af165f0701ca Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Wed, 11 Oct 2023 10:09:56 +0100
Subject: [PATCH 13/15] Add translatable strings

---
 .../playbackSettings/playbackSettings.template.html         | 6 +++---
 src/strings/en-us.json                                      | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/playbackSettings/playbackSettings.template.html b/src/components/playbackSettings/playbackSettings.template.html
index a3b0925261e..0926737af7c 100644
--- a/src/components/playbackSettings/playbackSettings.template.html
+++ b/src/components/playbackSettings/playbackSettings.template.html
@@ -74,9 +74,9 @@ <h2 class="sectionTitle">
 
         <div class="selectContainer">
             <select is="emby-select" id="selectAudioNormalization" label="${LabelSelectAudioNormalization}">
-                <option value="Off">Off</option>
-                <option value="TrackGain">Track Gain</option>
-                <option value="AlbumGain">Album Gain</option>
+                <option value="Off">${Off}</option>
+                <option value="TrackGain">${LabelTrackGain}</option>
+                <option value="AlbumGain">${LabelAlbumGain}</option>
             </select>
             <div class="fieldDescription">${SelectAudioNormalizationHelp}</div>
         </div>
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 42c8dcbd5b4..b76258897fb 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -548,6 +548,7 @@
     "LabelAlbumArtMaxResHelp": "Maximum resolution of album art exposed via the 'upnp:albumArtURI' property.",
     "LabelAlbumArtMaxWidth": "Album art max width",
     "LabelAlbumArtPN": "Album art PN",
+    "LabelAlbumGain": "Album Gain",
     "LabelAllowedRemoteAddresses": "Remote IP address filter",
     "LabelAllowedRemoteAddressesMode": "Remote IP address filter mode",
     "LabelAllowHWTranscoding": "Allow hardware transcoding",
@@ -1635,6 +1636,7 @@
     "LabelPlaybackInfo": "Playback Info",
     "LabelAudioInfo": "Audio Info",
     "LabelVideoInfo": "Video Info",
+    "LabelTrackGain": "Track Gain",
     "LabelTranscodingInfo": "Transcoding Info",
     "LabelDirectStreamingInfo": "Direct Streaming Info",
     "LabelRemuxingInfo": "Remuxing Info",

From 7c22d8d058dbee88f74005270d12eb9cafe3376f Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Tue, 17 Oct 2023 08:31:47 +0100
Subject: [PATCH 14/15] Add debug class names

---
 src/plugins/htmlAudioPlayer/plugin.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js
index 8271f240d4e..d9104638c8a 100644
--- a/src/plugins/htmlAudioPlayer/plugin.js
+++ b/src/plugins/htmlAudioPlayer/plugin.js
@@ -115,11 +115,11 @@ class HtmlAudioPlayer {
                 if (userSettings.selectAudioNormalization() == 'TrackGain' && options.item.LUFS != null) {
                     const dbGain = -18 - options.item.LUFS;
                     self.gainNode.gain.value = Math.pow(10, (dbGain / 20));
-                    console.debug('Using track gain');
+                    console.debug('[HtmlAudioPlayer] Using track gain');
                 } else if (userSettings.selectAudioNormalization() == 'AlbumGain' && options.mediaSource.albumLUFS != null) {
                     const dbGain = -18 - options.mediaSource.albumLUFS;
                     self.gainNode.gain.value = Math.pow(10, (dbGain / 20));
-                    console.debug('Using album gain');
+                    console.debug('[HtmlAudioPlayer] Using album gain');
                 } else {
                     self.gainNode.gain.value = 1;
                 }

From 321d1463f446c120035338ebc7208987ace1fab2 Mon Sep 17 00:00:00 2001
From: TelepathicWalrus <tom19978@googlemail.com>
Date: Tue, 17 Oct 2023 08:32:01 +0100
Subject: [PATCH 15/15] Correct grammer

---
 src/strings/en-us.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index b76258897fb..f7243d87ba1 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -138,7 +138,7 @@
     "ChannelNumber": "Channel number",
     "Channels": "Channels",
     "CinemaModeConfigurationHelp": "Cinema mode brings the theater experience straight to your living room with the ability to play trailers and custom intros before the main feature.",
-    "SelectAudioNormalizationHelp": "Track gain - adjusts the volume of each track so they playback with the same loudness. Album gain - adjusts the volume of all the tracks in an album only, keeping the albums dynamic range.",
+    "SelectAudioNormalizationHelp": "Track gain - adjusts the volume of each track so they playback with the same loudness. Album gain - adjusts the volume of all the tracks in an album only, keeping the album's dynamic range.",
     "ClearQueue": "Clear queue",
     "ClientSettings": "Client Settings",
     "Collections": "Collections",