From 2c38a3389b69dee7f82d167a17fe7222669c3798 Mon Sep 17 00:00:00 2001 From: Les Orchard Date: Thu, 18 Oct 2018 17:00:15 -0400 Subject: [PATCH] Alternate fade out fix Seems to fix an issue where the song would never advance after fading almost (but not quite) to zero --- src/MusicPlayer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/MusicPlayer.cpp b/src/MusicPlayer.cpp index d7f93862d..efd9075f0 100644 --- a/src/MusicPlayer.cpp +++ b/src/MusicPlayer.cpp @@ -71,8 +71,9 @@ void MusicPlayer::update() playEnded = true; break; } - if (fadeOutPos != 0 && fadeOutPos >= pos) { - fifo.setVolume((fadeOutPos - pos) / (float)fadeLength); + + if (fadeOutPos != 0) { + fifo.setVolume(std::min(0, fadeOutPos - pos) / (float)fadeLength); } fifo.put(&tempBuf[0], rc);