git.kitaultman.com Git - music-assistant-server.git/commit

projects / music-assistant-server.git / commit

author	Marcel van der Veldt <m.vanderveldt@outlook.com>
	Sun, 15 Feb 2026 14:50:45 +0000 (15:50 +0100)
committer	GitHub <noreply@github.com>
	Sun, 15 Feb 2026 14:50:45 +0000 (15:50 +0100)
commit	6385ab565acee763f390057dbd38fd5c65718960
tree	fa0a04f8c671daa73a04ca0c7e0c34793bbc61f6	tree \| snapshot
parent	1eb9d0c815119907ad7f7a14025a4f18e2cf8435	commit \| diff

Merge players with multiple protocols together (#3150)

* Base implementation of merging players through protocol linking

* Restore after merge conflict

* follow-up

* Fix config handling for players

* some tweaks

* Handle more (edge) cases

* bunch of fixes

* More fixes

* Some more tweaks

* Fix group_members calc

* A bunch of tweaks and refactoring

* more tweaks

* more follow-up

* Update controller.py

* refactoring groups

* more fixes for syncgroup

* fix readme nitpick

* revert frozen in uv run

* Add default providers conf

* fix tests

* more tweaks

* fixes for syncgroups

* More small tweaks

* more sync player tweaks

79 files changed:

music_assistant/constants.py		diff \| blob \| history
music_assistant/controllers/config.py		diff \| blob \| history
music_assistant/controllers/player_queues.py		diff \| blob \| history
music_assistant/controllers/players/README.md	[new file with mode: 0644]	blob
music_assistant/controllers/players/__init__.py		diff \| blob \| history
music_assistant/controllers/players/controller.py	[new file with mode: 0644]	blob
music_assistant/controllers/players/helpers.py	[new file with mode: 0644]	blob
music_assistant/controllers/players/player_controller.py	[deleted file]	blob \| history
music_assistant/controllers/players/protocol_linking.py	[new file with mode: 0644]	blob
music_assistant/controllers/players/sync_groups.py	[deleted file]	blob \| history
music_assistant/controllers/streams/streams_controller.py		diff \| blob \| history
music_assistant/controllers/webserver/README.md		diff \| blob \| history
music_assistant/helpers/audio.py		diff \| blob \| history
music_assistant/helpers/util.py		diff \| blob \| history
music_assistant/mass.py		diff \| blob \| history
music_assistant/models/player.py		diff \| blob \| history
music_assistant/models/player_provider.py		diff \| blob \| history
music_assistant/models/provider.py		diff \| blob \| history
music_assistant/providers/_demo_player_provider/player.py		diff \| blob \| history
music_assistant/providers/_demo_player_provider/provider.py		diff \| blob \| history
music_assistant/providers/airplay/helpers.py		diff \| blob \| history
music_assistant/providers/airplay/player.py		diff \| blob \| history
music_assistant/providers/airplay/protocols/raop.py		diff \| blob \| history
music_assistant/providers/airplay/provider.py		diff \| blob \| history
music_assistant/providers/airplay/stream_session.py		diff \| blob \| history
music_assistant/providers/airplay_receiver/__init__.py		diff \| blob \| history
music_assistant/providers/alexa/__init__.py		diff \| blob \| history
music_assistant/providers/bluesound/const.py		diff \| blob \| history
music_assistant/providers/bluesound/player.py		diff \| blob \| history
music_assistant/providers/bluesound/provider.py		diff \| blob \| history
music_assistant/providers/chromecast/helpers.py		diff \| blob \| history
music_assistant/providers/chromecast/player.py		diff \| blob \| history
music_assistant/providers/chromecast/provider.py		diff \| blob \| history
music_assistant/providers/dlna/manifest.json		diff \| blob \| history
music_assistant/providers/dlna/player.py		diff \| blob \| history
music_assistant/providers/dlna/provider.py		diff \| blob \| history
music_assistant/providers/fully_kiosk/player.py		diff \| blob \| history
music_assistant/providers/hass_players/player.py		diff \| blob \| history
music_assistant/providers/hass_players/provider.py		diff \| blob \| history
music_assistant/providers/heos/player.py		diff \| blob \| history
music_assistant/providers/heos/provider.py		diff \| blob \| history
music_assistant/providers/musiccast/player.py		diff \| blob \| history
music_assistant/providers/musiccast/provider.py		diff \| blob \| history
music_assistant/providers/plex_connect/__init__.py		diff \| blob \| history
music_assistant/providers/plex_connect/player_remote.py		diff \| blob \| history
music_assistant/providers/roku_media_assistant/player.py		diff \| blob \| history
music_assistant/providers/roku_media_assistant/provider.py		diff \| blob \| history
music_assistant/providers/sendspin/player.py		diff \| blob \| history
music_assistant/providers/snapcast/player.py		diff \| blob \| history
music_assistant/providers/snapcast/provider.py		diff \| blob \| history
music_assistant/providers/sonos/const.py		diff \| blob \| history
music_assistant/providers/sonos/player.py		diff \| blob \| history
music_assistant/providers/sonos/provider.py		diff \| blob \| history
music_assistant/providers/sonos_s1/constants.py		diff \| blob \| history
music_assistant/providers/sonos_s1/player.py		diff \| blob \| history
music_assistant/providers/sonos_s1/provider.py		diff \| blob \| history
music_assistant/providers/spotify_connect/ARCHITECTURE.md		diff \| blob \| history
music_assistant/providers/spotify_connect/__init__.py		diff \| blob \| history
music_assistant/providers/squeezelite/player.py		diff \| blob \| history
music_assistant/providers/squeezelite/provider.py		diff \| blob \| history
music_assistant/providers/sync_group/__init__.py	[new file with mode: 0644]	blob
music_assistant/providers/sync_group/constants.py	[new file with mode: 0644]	blob
music_assistant/providers/sync_group/icon.svg	[new file with mode: 0644]	blob
music_assistant/providers/sync_group/icon_monochrome.svg	[new file with mode: 0644]	blob
music_assistant/providers/sync_group/manifest.json	[new file with mode: 0644]	blob
music_assistant/providers/sync_group/player.py	[new file with mode: 0644]	blob
music_assistant/providers/sync_group/provider.py	[new file with mode: 0644]	blob
music_assistant/providers/universal_group/player.py		diff \| blob \| history
music_assistant/providers/universal_player/README.md	[new file with mode: 0644]	blob
music_assistant/providers/universal_player/__init__.py	[new file with mode: 0644]	blob
music_assistant/providers/universal_player/constants.py	[new file with mode: 0644]	blob
music_assistant/providers/universal_player/manifest.json	[new file with mode: 0644]	blob
music_assistant/providers/universal_player/player.py	[new file with mode: 0644]	blob
music_assistant/providers/universal_player/provider.py	[new file with mode: 0644]	blob
pyproject.toml		diff \| blob \| history
tests/common.py		diff \| blob \| history
tests/core/test_player_controller.py	[new file with mode: 0644]	blob
tests/core/test_player_grouping.py	[new file with mode: 0644]	blob
tests/core/test_protocol_linking.py	[new file with mode: 0644]	blob

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom