MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-27 23:55:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make player_playback_stop() a synchronous call for real

Browse Source 
Also, don't stop RAOP devices, just FLUSH them; this saves time when we
restart playback soon after stopping.
This commit is contained in:
Julien BLACHE 2010-12-12 10:25:21 +01:00
parent 507cdb00e8
commit 00c6de15ae
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/player.c
View File

@ -1889,7 +1889,36 @@ now_playing(struct player_command *cmd)
static int
playback_stop(struct player_command *cmd)
{
playback_abort();
if (laudio_status != LAUDIO_CLOSED)
laudio_close();
/* We may be restarting very soon, so we don't bring the devices to a
* full stop just yet; this saves time when restarting, which is nicer
* for the user.
*/
cmd->raop_pending = raop_flush(device_command_cb, last_rtptime + AIRTUNES_V2_PACKET_SAMPLES);
if (event_initialized(&pb_timer_ev))
event_del(&pb_timer_ev);
close(pb_timer_fd);
pb_timer_fd = -1;
if (cur_playing)
source_stop(cur_playing);
else
source_stop(cur_streaming);
cur_playing = NULL;
cur_streaming = NULL;
evbuffer_drain(audio_buf, EVBUFFER_LENGTH(audio_buf));
status_update(PLAY_STOPPED);
/* We're async if we need to flush RAOP devices */
if (cmd->raop_pending > 0)
return 1; /* async */
return 0;
}