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

Cleanup async_announce in forked_daapd (#78457)

Browse Source
This commit is contained in:
uvjustin 2022-09-14 20:40:20 +08:00 committed by GitHub
parent 003d160a96
commit ae865a07b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
homeassistant/components/forked_daapd/media_player.py
View File

@ -672,7 +672,8 @@ class ForkedDaapdMaster(MediaPlayerEntity):
else: else:
_LOGGER.debug("Media type '%s' not supported", media_type) _LOGGER.debug("Media type '%s' not supported", media_type)
async def _async_announce(self, media_id: str): async def _async_announce(self, media_id: str) -> None:
"""Play a URI."""
saved_state = self.state # save play state saved_state = self.state # save play state
saved_mute = self.is_volume_muted saved_mute = self.is_volume_muted
sleep_future = asyncio.create_task( sleep_future = asyncio.create_task(
@ -696,14 +697,14 @@ class ForkedDaapdMaster(MediaPlayerEntity):
async with async_timeout.timeout(TTS_TIMEOUT): async with async_timeout.timeout(TTS_TIMEOUT):
await self._tts_playing_event.wait() await self._tts_playing_event.wait()
# we have started TTS, now wait for completion # we have started TTS, now wait for completion
except asyncio.TimeoutError:
self._tts_requested = False
_LOGGER.warning("TTS request timed out")
await asyncio.sleep( await asyncio.sleep(
self._queue["items"][0]["length_ms"] self._queue["items"][0]["length_ms"]
/ 1000 # player may not have updated yet so grab length from queue / 1000 # player may not have updated yet so grab length from queue
+ self._tts_pause_time + self._tts_pause_time
) )
except asyncio.TimeoutError:
self._tts_requested = False
_LOGGER.warning("TTS request timed out")
self._tts_playing_event.clear() self._tts_playing_event.clear()
# TTS done, return to normal # TTS done, return to normal
await self.async_turn_on() # restore outputs and volumes await self.async_turn_on() # restore outputs and volumes
@ -715,13 +716,12 @@ class ForkedDaapdMaster(MediaPlayerEntity):
) )
if saved_state == MediaPlayerState.PLAYING: if saved_state == MediaPlayerState.PLAYING:
await self.async_media_play() await self.async_media_play()
else: # restore stashed queue return
if saved_queue: if not saved_queue:
uris = "" return
for item in saved_queue["items"]: # Restore stashed queue
uris += item["uri"] + ","
await self._api.add_to_queue( await self._api.add_to_queue(
uris=uris, uris=",".join(item["uri"] for item in saved_queue["items"]),
playback="start", playback="start",
playback_from_position=saved_queue_position, playback_from_position=saved_queue_position,
clear=True, clear=True,
@ -729,7 +729,8 @@ class ForkedDaapdMaster(MediaPlayerEntity):
await self._api.seek(position_ms=saved_song_position) await self._api.seek(position_ms=saved_song_position)
if saved_state == MediaPlayerState.PAUSED: if saved_state == MediaPlayerState.PAUSED:
await self.async_media_pause() await self.async_media_pause()
elif saved_state != MediaPlayerState.PLAYING: return
if saved_state != MediaPlayerState.PLAYING:
await self.async_media_stop() await self.async_media_stop()
async def async_select_source(self, source: str) -> None: async def async_select_source(self, source: str) -> None: