async def start(self, start_ntp: int, skip: int = 0) -> None:
"""Initialize CLI process for a player."""
cli_binary = await get_cli_binary(self.player.protocol)
- assert self.player.discovery_info is not None
+ assert self.player.airplay_discovery_info is not None
player_id = self.player.player_id
sync_adjust = self.mass.config.get_raw_player_config_value(player_id, CONF_SYNC_ADJUST, 0)
)
txt_kv: str = ""
- for key, value in self.player.discovery_info.decoded_properties.items():
+ for key, value in self.player.airplay_discovery_info.decoded_properties.items():
txt_kv += f'"{key}={value}" '
# Note: skip parameter is accepted for API compatibility with base class
"--name",
self.player.display_name,
"--hostname",
- str(self.player.discovery_info.server),
+ str(self.player.airplay_discovery_info.server),
"--address",
str(self.player.address),
"--port",
- str(self.player.discovery_info.port),
+ str(self.player.airplay_discovery_info.port),
"--txt",
txt_kv,
"--ntpstart",
async def start(self, start_ntp: int) -> None:
"""Initialize CLIRaop process for a player."""
- assert self.player.discovery_info is not None # for type checker
+ assert self.player.raop_discovery_info is not None # for type checker
cli_binary = await get_cli_binary(self.player.protocol)
extra_args: list[str] = []
player_id = self.player.player_id
if self.player.config.get_value(CONF_ALAC_ENCODE, True):
extra_args += ["-alac"]
for prop in ("et", "md", "am", "pk", "pw"):
- if prop_value := self.player.discovery_info.decoded_properties.get(prop):
+ if prop_value := self.player.raop_discovery_info.decoded_properties.get(prop):
extra_args += [f"-{prop}", prop_value]
sync_adjust = self.player.config.get_value(CONF_SYNC_ADJUST, 0)
assert isinstance(sync_adjust, int)
"-ntpstart",
str(start_ntp),
"-port",
- str(self.player.discovery_info.port),
+ str(self.player.raop_discovery_info.port),
"-latency",
str(read_ahead),
"-volume",
"-cmdpipe",
self.commands_pipe.path,
"-udn",
- self.player.discovery_info.name,
+ self.player.raop_discovery_info.name,
self.player.address,
self.audio_pipe.path,
]
async def start_pairing(self) -> None:
"""Start pairing process for this protocol (if supported)."""
- assert self.player.discovery_info is not None # for type checker
+ assert self.player.raop_discovery_info is not None # for type checker
cli_binary = await get_cli_binary(self.player.protocol)
cliraop_args = [
"-if",
self.mass.streams.bind_ip,
"-port",
- str(self.player.discovery_info.port),
+ str(self.player.raop_discovery_info.port),
"-udn",
- self.player.discovery_info.name,
+ self.player.raop_discovery_info.name,
self.player.address,
]
self.player.logger.debug(
from music_assistant.models.player_provider import PlayerProvider
from .constants import (
+ AIRPLAY_DISCOVERY_TYPE,
CACHE_CATEGORY_PREV_VOLUME,
CONF_IGNORE_VOLUME,
DACP_DISCOVERY_TYPE,
FALLBACK_VOLUME,
+ RAOP_DISCOVERY_TYPE,
)
from .helpers import convert_airplay_volume, get_model_info
from .player import AirPlayPlayer
self, player_id: str, display_name: str, discovery_info: AsyncServiceInfo
) -> None:
"""Handle setup of a new player that is discovered using mdns."""
- if discovery_info.type == "_raop._tcp.local.":
+ raop_discovery_info: AsyncServiceInfo | None = None
+ airplay_discovery_info: AsyncServiceInfo | None = None
+ if discovery_info.type == RAOP_DISCOVERY_TYPE:
# RAOP service discovered
+ raop_discovery_info = discovery_info
self.logger.debug("Discovered RAOP service for %s", display_name)
# always prefer airplay mdns info as it has more details
# fallback to raop info if airplay info is not available,
# (old device only announcing raop)
- airplay_info = AsyncServiceInfo(
- "_airplay._tcp.local.",
+ airplay_discovery_info = AsyncServiceInfo(
+ AIRPLAY_DISCOVERY_TYPE,
discovery_info.name.split("@")[-1].replace("_raop", "_airplay"),
)
+ await airplay_discovery_info.async_request(self.mass.aiozc.zeroconf, 3000)
else:
# AirPlay service discovered
self.logger.debug("Discovered AirPlay service for %s", display_name)
- airplay_info = discovery_info
- if await airplay_info.async_request(self.mass.aiozc.zeroconf, 3000):
- manufacturer, model = get_model_info(airplay_info)
+ airplay_discovery_info = discovery_info
+
+ if airplay_discovery_info:
+ manufacturer, model = get_model_info(airplay_discovery_info)
+ elif raop_discovery_info:
+ manufacturer, model = get_model_info(raop_discovery_info)
else:
- manufacturer, model = get_model_info(discovery_info)
+ manufacturer, model = "Unknown", "Unknown"
if not self.mass.config.get_raw_player_config_value(player_id, "enabled", True):
self.logger.debug("Ignoring %s in discovery as it is disabled.", display_name)
if not is_apple and "airplay" not in display_name.lower():
display_name += " (AirPlay)"
+ # Final check before registration to handle race conditions
+ # (multiple MDNS events processed in parallel for same device)
+ if self.mass.players.get(player_id):
+ self.logger.debug(
+ "Player %s already registered during setup, skipping registration", player_id
+ )
+ return
+
self.logger.debug(
"Setting up player %s: manufacturer=%s, model=%s",
display_name,
player = AirPlayPlayer(
provider=self,
player_id=player_id,
- discovery_info=discovery_info,
+ raop_discovery_info=raop_discovery_info,
+ airplay_discovery_info=airplay_discovery_info,
address=address,
display_name=display_name,
manufacturer=manufacturer,
model=model,
initial_volume=volume,
)
-
- # Final check before registration to handle race conditions
- # (multiple MDNS events processed in parallel for same device)
- if self.mass.players.get(player_id):
- self.logger.debug(
- "Player %s already registered during setup, skipping registration", player_id
- )
- return
-
await self.mass.players.register(player)
async def _handle_dacp_request( # noqa: PLR0915
projects / music-assistant-server.git / commitdiff