Skip to content

Fix multiple (virtual) devices on the same host being merged.#3688

Merged
marcelveldt merged 1 commit intodevfrom
fix_protocol_merge_same_ip
Apr 14, 2026
Merged

Fix multiple (virtual) devices on the same host being merged.#3688
marcelveldt merged 1 commit intodevfrom
fix_protocol_merge_same_ip

Conversation

@MarvinSchenkel
Copy link
Copy Markdown
Contributor

@MarvinSchenkel MarvinSchenkel commented Apr 14, 2026

Make sure that universal players with the same IP, but different MAC address do not get merged.

Related issue: music-assistant/support#5266

@MarvinSchenkel MarvinSchenkel marked this pull request as ready for review April 14, 2026 19:06
Copilot AI review requested due to automatic review settings April 14, 2026 19:06
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Prevents universal players that represent multiple instances of the same protocol domain on a single host (same IP) from being merged together, addressing the “virtual devices on one host get merged” issue.

Changes:

  • Add a merge guard in _check_merge_universal_players to skip merging when both universal players already have linked protocols from the same domain.
  • Add a regression test covering multiple squeezelite instances on the same IP with distinct MACs to ensure no merge occurs.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
music_assistant/controllers/players/protocol_linking.py Skips UP merge when both candidates share at least one linked protocol domain (prevents same-domain instance merging on shared IP).
tests/core/test_protocol_linking.py Adds a regression test ensuring multiple same-domain protocol instances on one IP remain separate and keep their protocol links.

@marcelveldt marcelveldt merged commit 8cb32fb into dev Apr 14, 2026
22 checks passed
@marcelveldt marcelveldt deleted the fix_protocol_merge_same_ip branch April 14, 2026 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants