player/Thread: drain outputs at end of song in "single" mode

Without this, the Pause() call would drop the ring buffers and would skip a considerable portion of the end of the song. Closes https://github.com/MusicPlayerDaemon/MPD/issues/824

player/Thread: drain outputs at end of song in "single" mode
32a5bf04 · Max Kellermann · 8d207948 · 32a5bf04 · 32a5bf04
Commit 32a5bf04 authored Apr 14, 2020 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

NEWS NEWS +2 -0

Thread.cxx src/player/Thread.cxx +6 -0

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.21.23 (not yet released)
+* player
+  - drain outputs at end of song in "single" mode

 ver 0.21.22 (2020/04/02)
 * database

--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -964,6 +964,12 @@ Player::SongBorder() noexcept
 	if (border_pause) {
 		paused = true;
 		pc.listener.OnBorderPause();
+
+		/* drain all outputs to guarantee the current song is
+		   really being played to the end; without this, the
+		   Pause() call would drop all ring buffers */
+		pc.outputs.Drain();
+
 		pc.outputs.Pause();
 		idle_add(IDLE_PLAYER);
 	}