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

Fix sync/async and small improvements to forked_daapd (#37619)

Browse Source
This commit is contained in:
Franck Nijhof 2020-07-07 20:08:22 +02:00 committed by GitHub
parent 09ee52c4cb
commit 1499c0a563
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -435,7 +435,7 @@ class ForkedDaapdMaster(MediaPlayerEntity):
"""Pause player and store outputs state.""" """Pause player and store outputs state."""
await self.async_media_pause() await self.async_media_pause()
self._last_outputs = self._outputs self._last_outputs = self._outputs
if any([output["selected"] for output in self._outputs]): if any(output["selected"] for output in self._outputs):
await self._api.set_enabled_outputs([]) await self._api.set_enabled_outputs([])
async def async_toggle(self): async def async_toggle(self):
@ -461,7 +461,7 @@ class ForkedDaapdMaster(MediaPlayerEntity):
return STATE_PLAYING return STATE_PLAYING
if self._player["state"] == "pause": if self._player["state"] == "pause":
return STATE_PAUSED return STATE_PAUSED
if not any([output["selected"] for output in self._outputs]): if not any(output["selected"] for output in self._outputs):
return STATE_OFF return STATE_OFF
if self._player["state"] == "stop": # this should catch all remaining cases if self._player["state"] == "stop": # this should catch all remaining cases
return STATE_IDLE return STATE_IDLE
@ -720,24 +720,22 @@ 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 select_source(self, source): async def async_select_source(self, source):
"""Change source. """Change source.
Source name reflects whether in default mode or pipe mode. Source name reflects whether in default mode or pipe mode.
Selecting playlists/clear sets the playlists/clears but ends up in default mode. Selecting playlists/clear sets the playlists/clears but ends up in default mode.
""" """
if source != self._source: if source == self._source:
if ( return
self._use_pipe_control()
): # if pipe was playing, we need to stop it first if self._use_pipe_control(): # if pipe was playing, we need to stop it first
await self._pause_and_wait_for_callback() await self._pause_and_wait_for_callback()
self._source = source self._source = source
if not self._use_pipe_control(): # playlist or clear ends up at default if not self._use_pipe_control(): # playlist or clear ends up at default
self._source = SOURCE_NAME_DEFAULT self._source = SOURCE_NAME_DEFAULT
if self._sources_uris.get(source): # load uris for pipes or playlists if self._sources_uris.get(source): # load uris for pipes or playlists
await self._api.add_to_queue( await self._api.add_to_queue(uris=self._sources_uris[source], clear=True)
uris=self._sources_uris[source], clear=True
)
elif source == SOURCE_NAME_CLEAR: # clear playlist elif source == SOURCE_NAME_CLEAR: # clear playlist
await self._api.clear_queue() await self._api.clear_queue()
self.async_write_ha_state() self.async_write_ha_state()