MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-27 06:33:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #630 from chme/stream_pause

Browse Source 
Improve pausing radio streams
This commit is contained in:
ejurgensen 2018-11-30 17:17:38 +01:00 committed by GitHub
commit c1ce503b8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/player.c
View File

@ -593,7 +593,7 @@ source_pause(uint64_t pos)
if (!ps_playing) if (!ps_playing)
return -1; return -1;
if (cur_streaming && (cur_streaming == ps_playing)) if (cur_streaming)
{ {
if (ps_playing != cur_streaming) if (ps_playing != cur_streaming)
{ {
@ -2003,6 +2003,19 @@ playback_start_item(void *arg, int *retval)
// Resume playback of current source // Resume playback of current source
ps = source_now_playing(); ps = source_now_playing();
DPRINTF(E_DBG, L_PLAYER, "Resume playback of '%s' (id=%d, item-id=%d)\n", ps->path, ps->id, ps->item_id); DPRINTF(E_DBG, L_PLAYER, "Resume playback of '%s' (id=%d, item-id=%d)\n", ps->path, ps->id, ps->item_id);
// Check if source needs to be reopend
if (!ps->setup_done)
{
DPRINTF(E_INFO, L_PLAYER, "Opening '%s'\n", ps->path);
ret = input_setup(ps);
if (ret < 0)
{
DPRINTF(E_LOG, L_PLAYER, "Failed to open '%s'\n", ps->path);
return -1;
}
}
} }
else else
{ {
@ -2330,10 +2343,11 @@ playback_pause_bh(void *arg, int *retval)
if (cur_streaming->data_kind == DATA_KIND_HTTP || cur_streaming->data_kind == DATA_KIND_PIPE) if (cur_streaming->data_kind == DATA_KIND_HTTP || cur_streaming->data_kind == DATA_KIND_PIPE)
{ {
DPRINTF(E_DBG, L_PLAYER, "Source is not pausable, abort playback\n"); // For stream and pipe input we stop reading from the source but still switch to the paused state.
// (Resuming playback will reopen the source)
DPRINTF(E_DBG, L_PLAYER, "Source is not pausable, stop playback\n");
playback_abort(); input_stop(cur_streaming);
return COMMAND_END;
} }
status_update(PLAY_PAUSED); status_update(PLAY_PAUSED);