From 351e4fb8ded2f68fa6fec0a4f30d3d6cc21db868 Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Fri, 24 May 2019 23:06:31 +0200 Subject: [PATCH] fix player settings --- music_assistant/modules/homeassistant.py | 13 ------------- music_assistant/modules/player.py | 5 +++++ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/music_assistant/modules/homeassistant.py b/music_assistant/modules/homeassistant.py index e01ff03d..13938613 100644 --- a/music_assistant/modules/homeassistant.py +++ b/music_assistant/modules/homeassistant.py @@ -50,19 +50,6 @@ def create_config_entries(config): for key, def_value, desc in config_entries: if not key in config['base']['homeassistant']: config['base']['homeassistant'][key] = def_value - # append hass player config settings - if config['base']['homeassistant'][CONF_ENABLED]: - hass_player_conf = [("hass_power_entity", "", "hass_player_power"), - ("hass_power_entity_source", "", "hass_player_source"), - ("hass_volume_entity", "", "hass_player_volume")] - for key, default, desc in hass_player_conf: - entry_found = False - for value in config['player_settings']['__desc__']: - if value[0] == key: - entry_found = True - break - if not entry_found: - config['player_settings']['__desc__'].append((key, default, desc)) class HomeAssistant(): ''' HomeAssistant integration ''' diff --git a/music_assistant/modules/player.py b/music_assistant/modules/player.py index 218a3025..da0bb0a4 100755 --- a/music_assistant/modules/player.py +++ b/music_assistant/modules/player.py @@ -251,6 +251,11 @@ class Player(): ("max_sample_rate", '96000', "max_sample_rate"), ("force_http_streamer", False, "force_http_streamer") ] + if self.mass.config['base'].get('homeassistant',{})["enabled"]: + # append hass specific config entries + config_entries += [("hass_power_entity", "", "hass_player_power"), + ("hass_power_entity_source", "", "hass_player_source"), + ("hass_volume_entity", "", "hass_player_volume")] player_settings = self.mass.config['player_settings'].get(player_id,{}) for key, def_value, desc in config_entries: if not key in player_settings: -- 2.34.1