jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-27 07:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove incorrect use of via_device in roon component (#146572)

Browse Source
This commit is contained in:
Greg Dowling 2025-07-04 16:04:16 +01:00 committed by GitHub
parent 3250a2fb46
commit cf931a75a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/roon/event.py
View File

@ -31,7 +31,7 @@ async def async_setup_entry(
if dev_id in event_entities: if dev_id in event_entities:
return return
# new player! # new player!
event_entity = RoonEventEntity(roon_server, player_data) event_entity = RoonEventEntity(roon_server, player_data, config_entry.entry_id)
event_entities.add(dev_id) event_entities.add(dev_id)
async_add_entities([event_entity]) async_add_entities([event_entity])
@ -50,13 +50,14 @@ class RoonEventEntity(EventEntity):
_attr_event_types = ["volume_up", "volume_down", "mute_toggle"] _attr_event_types = ["volume_up", "volume_down", "mute_toggle"]
_attr_translation_key = "volume" _attr_translation_key = "volume"
def __init__(self, server, player_data): def __init__(self, server, player_data, entry_id):
"""Initialize the entity.""" """Initialize the entity."""
self._server = server self._server = server
self._player_data = player_data self._player_data = player_data
player_name = player_data["display_name"] player_name = player_data["display_name"]
self._attr_name = f"{player_name} roon volume" self._attr_name = f"{player_name} roon volume"
self._attr_unique_id = self._player_data["dev_id"] self._attr_unique_id = self._player_data["dev_id"]
self._entry_id = entry_id
if self._player_data.get("source_controls"): if self._player_data.get("source_controls"):
dev_model = self._player_data["source_controls"][0].get("display_name") dev_model = self._player_data["source_controls"][0].get("display_name")
@ -69,7 +70,7 @@ class RoonEventEntity(EventEntity):
name=cast(str | None, self.name), name=cast(str | None, self.name),
manufacturer="RoonLabs", manufacturer="RoonLabs",
model=dev_model, model=dev_model,
via_device=(DOMAIN, self._server.roon_id), via_device=(DOMAIN, self._entry_id),
) )
def _roonapi_volume_callback( def _roonapi_volume_callback(

7
homeassistant/components/roon/media_player.py
View File

@ -72,7 +72,7 @@ async def async_setup_entry(
dev_id = player_data["dev_id"] dev_id = player_data["dev_id"]
if dev_id not in media_players: if dev_id not in media_players:
# new player! # new player!
media_player = RoonDevice(roon_server, player_data) media_player = RoonDevice(roon_server, player_data, config_entry.entry_id)
media_players.add(dev_id) media_players.add(dev_id)
async_add_entities([media_player]) async_add_entities([media_player])
else: else:
@ -106,7 +106,7 @@ class RoonDevice(MediaPlayerEntity):
| MediaPlayerEntityFeature.PLAY_MEDIA | MediaPlayerEntityFeature.PLAY_MEDIA
) )
def __init__(self, server, player_data): def __init__(self, server, player_data, entry_id):
"""Initialize Roon device object.""" """Initialize Roon device object."""
self._remove_signal_status = None self._remove_signal_status = None
self._server = server self._server = server
@ -125,6 +125,7 @@ class RoonDevice(MediaPlayerEntity):
self._attr_volume_level = 0 self._attr_volume_level = 0
self._volume_fixed = True self._volume_fixed = True
self._volume_incremental = False self._volume_incremental = False
self._entry_id = entry_id
self.update_data(player_data) self.update_data(player_data)
async def async_added_to_hass(self) -> None: async def async_added_to_hass(self) -> None:
@ -166,7 +167,7 @@ class RoonDevice(MediaPlayerEntity):
name=cast(str | None, self.name), name=cast(str | None, self.name),
manufacturer="RoonLabs", manufacturer="RoonLabs",
model=dev_model, model=dev_model,
via_device=(DOMAIN, self._server.roon_id), via_device=(DOMAIN, self._entry_id),
) )
def update_data(self, player_data=None): def update_data(self, player_data=None):