From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Fri, 2 May 2025 15:03:57 +0000 (+0200)
Subject: Fix: stop airplay playback when player reports it has become inactive
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=50ede353e8ab33cb5a74a32faa770368e9899f9a;p=music-assistant-server.git

Fix: stop airplay playback when player reports it has become inactive
---

diff --git a/music_assistant/providers/airplay/provider.py b/music_assistant/providers/airplay/provider.py
index 1312ab43..14e9a5e6 100644
--- a/music_assistant/providers/airplay/provider.py
+++ b/music_assistant/providers/airplay/provider.py
@@ -654,13 +654,9 @@ class AirPlayProvider(PlayerProvider):
             elif "device-prevent-playback=1" in path:
                 # device switched to another source (or is powered off)
                 if raop_stream := airplay_player.raop_stream:
-                    # ignore this if we just started playing to prevent false positives
-                    elapsed_time = (
-                        10 if mass_player.elapsed_time is None else mass_player.elapsed_time
+                    self.mass.create_task(
+                        airplay_player.raop_stream.session.remove_client(airplay_player)
                     )
-                    if elapsed_time > 10 and mass_player.state == PlayerState.PLAYING:
-                        raop_stream.prevent_playback = True
-                        self.mass.create_task(self.monitor_prevent_playback(player_id))
             elif "device-prevent-playback=0" in path:
                 # device reports that its ready for playback again
                 if raop_stream := airplay_player.raop_stream:
@@ -678,30 +674,3 @@ class AirPlayProvider(PlayerProvider):
             await writer.drain()
         finally:
             writer.close()
-
-    async def monitor_prevent_playback(self, player_id: str) -> None:
-        """Monitor the prevent playback state of an airplay player."""
-        count = 0
-        if not (airplay_player := self._players.get(player_id)):
-            return
-        if not airplay_player.raop_stream:
-            return
-        prev_active_remote_id = airplay_player.raop_stream.active_remote_id
-        while count < 40:
-            count += 1
-            if not (airplay_player := self._players.get(player_id)):
-                return
-            if not (raop_stream := airplay_player.raop_stream):
-                return
-            if raop_stream.active_remote_id != prev_active_remote_id:
-                # checksum
-                return
-            if not raop_stream.prevent_playback:
-                return
-            await asyncio.sleep(0.5)
-
-        if airplay_player.raop_stream and airplay_player.raop_stream.session:
-            airplay_player.logger.info(
-                "Player has been in prevent playback mode for too long, aborting playback.",
-            )
-            await airplay_player.raop_stream.session.remove_client(airplay_player)
diff --git a/music_assistant/providers/airplay/raop.py b/music_assistant/providers/airplay/raop.py
index ad18e568..e71a4be4 100644
--- a/music_assistant/providers/airplay/raop.py
+++ b/music_assistant/providers/airplay/raop.py
@@ -100,7 +100,7 @@ class RaopStreamSession:
         assert airplay_player.raop_stream.session == self
         async with self._lock:
             self._sync_clients.remove(airplay_player)
-        await airplay_player.raop_stream.stop()
+        await airplay_player.cmd_stop()
         airplay_player.raop_stream = None
 
     async def add_client(self, airplay_player: AirPlayPlayer) -> None: