diff --git a/src/components/playbackSettings/playbackSettings.js b/src/components/playbackSettings/playbackSettings.js index 9f69acb797..49ca927173 100644 --- a/src/components/playbackSettings/playbackSettings.js +++ b/src/components/playbackSettings/playbackSettings.js @@ -233,8 +233,6 @@ import template from './playbackSettings.template.html'; userSettingsInstance.preferFmp4HlsContainer(context.querySelector('.chkPreferFmp4HlsContainer').checked); userSettingsInstance.enableCinemaMode(context.querySelector('.chkEnableCinemaMode').checked); userSettingsInstance.enableAudioNormalization(context.querySelector('.chkEnableAudioNormalization').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/plugins/htmlAudioPlayer/plugin.js b/src/plugins/htmlAudioPlayer/plugin.js index 82db43a1a1..3e745101a2 100644 --- a/src/plugins/htmlAudioPlayer/plugin.js +++ b/src/plugins/htmlAudioPlayer/plugin.js @@ -4,7 +4,6 @@ import * as htmlMediaHelper from '../../components/htmlMediaHelper'; import profileBuilder from '../../scripts/browserDeviceProfile'; import { getIncludeCorsCredentials } from '../../scripts/settings/webSettings'; import Events from '../../utils/events.ts'; -import { UserSettings } from '../../scripts/settings/userSettings'; function getDefaultProfile() { return profileBuilder({}); @@ -109,10 +108,9 @@ class HtmlAudioPlayer { let val = options.url; console.debug('playing url: ' + val); import('../../scripts/settings/userSettings').then((userSettings)=> { - if(userSettings.enableAudioNormalization()){ + if (userSettings.enableAudioNormalization()) { const dbGain = -18 - options.item.LUFS; - console.debug(options.item); - self.gainNode.gain.value = Math.pow(10, (dbGain/20)); + self.gainNode.gain.value = Math.pow(10, (dbGain / 20)); } else { self.gainNode.gain.value = 1; } @@ -120,15 +118,12 @@ class HtmlAudioPlayer { console.debug('gain:' + self.gainNode.gain.value); - // Convert to seconds const seconds = (options.playerStartPositionTicks || 0) / 10000000; if (seconds) { val += '#t=' + seconds; } - - htmlMediaHelper.destroyHlsPlayer(self); self._currentPlayOptions = options; @@ -272,7 +267,7 @@ class HtmlAudioPlayer { source.connect(gainNode); gainNode.connect(audioCtx.destination); - self.gainNode = gainNode + self.gainNode = gainNode; } function onEnded() { diff --git a/src/scripts/settings/userSettings.js b/src/scripts/settings/userSettings.js index adce42dfbb..97bb90e6a9 100644 --- a/src/scripts/settings/userSettings.js +++ b/src/scripts/settings/userSettings.js @@ -162,13 +162,13 @@ export class UserSettings { * @return {boolean} 'Enable Audio Normalization' state. */ enableAudioNormalization(val) { - if (val !== undefined) { - return this.set('enableAudioNormalization', val.toString(), false); - } - - return toBoolean(this.get('enableAudioNormalization', false), true); + if (val !== undefined) { + return this.set('enableAudioNormalization', val.toString(), false); } + return toBoolean(this.get('enableAudioNormalization', false), true); + } + /** * Get or set 'Next Video Info Overlay' state. * @param {boolean|undefined} val - Flag to enable 'Next Video Info Overlay' or undefined.