From d2b8ce16e07368384a8f4b9523a8eed297e24766 Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Sun, 28 Apr 2024 21:55:07 +0200 Subject: [PATCH 1/4] Fall back to other normalization gain if preferred one is null --- src/plugins/htmlAudioPlayer/plugin.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js index 4dde693f8..cf67329af 100644 --- a/src/plugins/htmlAudioPlayer/plugin.js +++ b/src/plugins/htmlAudioPlayer/plugin.js @@ -113,16 +113,16 @@ class HtmlAudioPlayer { let val = options.url; console.debug('playing url: ' + val); import('../../scripts/settings/userSettings').then((userSettings) => { - if (userSettings.selectAudioNormalization() == 'TrackGain' && options.item.NormalizationGain != null) { - self.gainNode.gain.value = Math.pow(10, (options.item.NormalizationGain / 20)); - console.debug('[HtmlAudioPlayer] Using track gain'); - } else if (userSettings.selectAudioNormalization() == 'AlbumGain' && options.mediaSource.albumNormalizationGain != null) { - self.gainNode.gain.value = Math.pow(10, (options.mediaSource.albumNormalizationGain / 20)); - console.debug('[HtmlAudioPlayer] Using album gain'); + if (userSettings.selectAudioNormalization() == 'TrackGain' + && (options.item.NormalizationGain != null || options.mediaSource.albumNormalizationGain != null)) { + self.gainNode.gain.value = Math.pow(10, ((options.item.NormalizationGain ?? options.mediaSource.albumNormalizationGain) / 20)); + } else if (userSettings.selectAudioNormalization() == 'AlbumGain' + && (options.mediaSource.albumNormalizationGain != null || options.item.NormalizationGain != null)) { + self.gainNode.gain.value = Math.pow(10, ((options.mediaSource.albumNormalizationGain ?? options.item.NormalizationGain) / 20)); } else { self.gainNode.gain.value = 1; } - console.debug('gain:' + self.gainNode.gain.value); + console.debug('gain: ' + self.gainNode.gain.value); }).catch((err) => { console.error('Failed to add/change gainNode', err); }); From c7b6f4418c13eb427af20c92932837dec1d2866f Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Tue, 30 Apr 2024 21:46:29 +0200 Subject: [PATCH 2/4] Address comments --- src/plugins/htmlAudioPlayer/plugin.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/plugins/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js index cf67329af..9a4b6d32d 100644 --- a/src/plugins/htmlAudioPlayer/plugin.js +++ b/src/plugins/htmlAudioPlayer/plugin.js @@ -113,12 +113,19 @@ class HtmlAudioPlayer { let val = options.url; console.debug('playing url: ' + val); import('../../scripts/settings/userSettings').then((userSettings) => { - if (userSettings.selectAudioNormalization() == 'TrackGain' - && (options.item.NormalizationGain != null || options.mediaSource.albumNormalizationGain != null)) { - self.gainNode.gain.value = Math.pow(10, ((options.item.NormalizationGain ?? options.mediaSource.albumNormalizationGain) / 20)); - } else if (userSettings.selectAudioNormalization() == 'AlbumGain' - && (options.mediaSource.albumNormalizationGain != null || options.item.NormalizationGain != null)) { - self.gainNode.gain.value = Math.pow(10, ((options.mediaSource.albumNormalizationGain ?? options.item.NormalizationGain) / 20)); + let normalizationGain; + if (userSettings.selectAudioNormalization() == 'TrackGain') { + normalizationGain = + options.item.NormalizationGain ?? + options.mediaSource.albumNormalizationGain; + } else if (userSettings.selectAudioNormalization() == 'AlbumGain') { + normalizationGain = + options.item.albumNormalizationGain ?? + options.mediaSource.NormalizationGain; + } + + if (normalizationGain) { + self.gainNode.gain.value = Math.pow(10, normalizationGain / 20); } else { self.gainNode.gain.value = 1; } From a890220aaaf71e9af748976c55bb19542f9d2918 Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Tue, 30 Apr 2024 21:47:56 +0200 Subject: [PATCH 3/4] Fix album gain --- 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 9a4b6d32d..24c124380 100644 --- a/src/plugins/htmlAudioPlayer/plugin.js +++ b/src/plugins/htmlAudioPlayer/plugin.js @@ -120,8 +120,8 @@ class HtmlAudioPlayer { options.mediaSource.albumNormalizationGain; } else if (userSettings.selectAudioNormalization() == 'AlbumGain') { normalizationGain = - options.item.albumNormalizationGain ?? - options.mediaSource.NormalizationGain; + options.mediaSource.albumNormalizationGain ?? + options.item.NormalizationGain; } if (normalizationGain) { From d36e5ee32da634babf848899521c70e5a07ee668 Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Tue, 30 Apr 2024 21:48:49 +0200 Subject: [PATCH 4/4] Fix style --- src/plugins/htmlAudioPlayer/plugin.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js index 24c124380..ee226ebcc 100644 --- a/src/plugins/htmlAudioPlayer/plugin.js +++ b/src/plugins/htmlAudioPlayer/plugin.js @@ -115,13 +115,12 @@ class HtmlAudioPlayer { import('../../scripts/settings/userSettings').then((userSettings) => { let normalizationGain; if (userSettings.selectAudioNormalization() == 'TrackGain') { - normalizationGain = - options.item.NormalizationGain ?? - options.mediaSource.albumNormalizationGain; + normalizationGain = options.item.NormalizationGain + ?? options.mediaSource.albumNormalizationGain; } else if (userSettings.selectAudioNormalization() == 'AlbumGain') { normalizationGain = - options.mediaSource.albumNormalizationGain ?? - options.item.NormalizationGain; + options.mediaSource.albumNormalizationGain + ?? options.item.NormalizationGain; } if (normalizationGain) {