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

[player] Avoid repeated resets on output delay when changing track (issue #781)

Browse Source
This commit is contained in:
ejurgensen 2019-08-18 23:12:10 +02:00
parent 19ba9d106a
commit 9cb5810e9a
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/player.c
View File

@ -1706,21 +1706,25 @@ pb_resume(void)
} }
// Temporarily suspends/resets playback, used when input buffer underruns or in // Temporarily suspends/resets playback, used when input buffer underruns or in
// case of problems writing to the outputs. Especially in the latter case the // case of problems writing to the outputs.
// input may have proceeded to a source further ahead than playing_now, so we
// may also need to reset the input, so that we resume with playing_now.
static void static void
pb_suspend(void) pb_suspend(void)
{ {
struct db_queue_item *queue_item; struct db_queue_item *queue_item;
struct player_source *ps;
int ret; int ret;
// Start session again to reset input, also flushes input buffer // If ->next is set then suspend was called during a track change, which is a
ps = pb_session.playing_now; // tricky time. To simplify things, we reset the entire session, which also
if (ps != pb_session.source_list) // means resetting the input, but still letting it proceed with the head of
// source_list. Ideally, we instead want to resume with playing_now, because
// with the current solution the user will loose a bit of audio. In practice,
// that causes issues, because sometimes pb_suspend() is called because of an
// output delay, which was caused by e.g. changing quality of the output
// during track change. So going back to playing_now would make that repeat.
if (pb_session.playing_now->next)
{ {
queue_item = db_queue_fetch_byitemid(ps->item_id); // So we restart the session with the head source, not playing_now
queue_item = db_queue_fetch_byitemid(pb_session.source_list->item_id);
if (!queue_item) if (!queue_item)
{ {
DPRINTF(E_LOG, L_PLAYER, "Error suspending playback, could not retrieve queue item currently being played\n"); DPRINTF(E_LOG, L_PLAYER, "Error suspending playback, could not retrieve queue item currently being played\n");
@ -1728,7 +1732,7 @@ pb_suspend(void)
return; return;
} }
ret = pb_session_start(queue_item, ps->pos_ms); ret = pb_session_start(queue_item, 0);
free_queue_item(queue_item, 0); free_queue_item(queue_item, 0);
if (ret < 0) if (ret < 0)
{ {