From: Marcel van der Veldt Date: Fri, 19 Apr 2024 10:16:28 +0000 (+0200) Subject: fix target_loudness on streamdetails X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=9d3de2e988cfa836f23795dffda366f7557a558c;p=music-assistant-server.git fix target_loudness on streamdetails --- diff --git a/music_assistant/common/models/streamdetails.py b/music_assistant/common/models/streamdetails.py index c56b6f88..c96ce9cb 100644 --- a/music_assistant/common/models/streamdetails.py +++ b/music_assistant/common/models/streamdetails.py @@ -69,7 +69,6 @@ class StreamDetails(DataClassDictMixin): d.pop("seconds_streamed", None) d.pop("seek_position", None) d.pop("fade_in", None) - d.pop("target_loudness", None) return d @property diff --git a/music_assistant/server/helpers/audio.py b/music_assistant/server/helpers/audio.py index c8e0cabf..136a8c47 100644 --- a/music_assistant/server/helpers/audio.py +++ b/music_assistant/server/helpers/audio.py @@ -37,7 +37,6 @@ from music_assistant.constants import ( CONF_EQ_MID, CONF_EQ_TREBLE, CONF_OUTPUT_CHANNELS, - CONF_VOLUME_NORMALIZATION, CONF_VOLUME_NORMALIZATION_TARGET, MASS_LOGGER_NAME, VERBOSE_LOG_LEVEL, @@ -393,11 +392,8 @@ async def get_stream_details( streamdetails.loudness = await mass.music.get_track_loudness( streamdetails.item_id, streamdetails.provider ) - if streamdetails.target_loudness is not None: - streamdetails.target_loudness = streamdetails.target_loudness - elif ( - player_settings := await mass.config.get_player_config(streamdetails.queue_id) - ) and player_settings.get_value(CONF_VOLUME_NORMALIZATION): + player_settings = await mass.config.get_player_config(streamdetails.queue_id) + if player_settings.get_value(CONF_VOLUME_NORMALIZATION_TARGET): streamdetails.target_loudness = player_settings.get_value(CONF_VOLUME_NORMALIZATION_TARGET) else: streamdetails.target_loudness = None