fix target_loudness on streamdetails
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Fri, 19 Apr 2024 10:16:28 +0000 (12:16 +0200)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Fri, 19 Apr 2024 10:16:28 +0000 (12:16 +0200)
music_assistant/common/models/streamdetails.py
music_assistant/server/helpers/audio.py

index c56b6f88d1676734b1b39ef9606c7e108ebfd2cc..c96ce9cbba6ae183b0b774f7a75d9d405eb2d51f 100644 (file)
@@ -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
index c8e0cabf08a15cd296dc1f95556e4599547dee1c..136a8c473515b28d25cf2a09d3a9578bf0a7f641 100644 (file)
@@ -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