From bbd8748f86d1234a2a60f7ff0b7fcb8278812ca2 Mon Sep 17 00:00:00 2001 From: piebrain <72815066+piebrain@users.noreply.github.com> Date: Mon, 26 Oct 2020 21:54:37 -0400 Subject: [PATCH] Reset errors and avoid memory leak (#321) When reusing the AudioGeneratorMP3 object to play multiple files with errors, the error count was never reset. Also, if 3 errors are encountered, it would stop running but never clean up the buffers. --- src/AudioGeneratorMP3.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/AudioGeneratorMP3.cpp b/src/AudioGeneratorMP3.cpp index 9cc90b7..d962c9e 100644 --- a/src/AudioGeneratorMP3.cpp +++ b/src/AudioGeneratorMP3.cpp @@ -231,7 +231,8 @@ retry: audioLogger->printf_P(PSTR("MP3:ERROR_BUFLEN %d\n"), unrecoverable); if (++unrecoverable >= 3) { unrecoverable = 0; - return (running = false); + stop(); + return running; } } else { unrecoverable = 0; @@ -269,6 +270,9 @@ bool AudioGeneratorMP3::begin(AudioFileSource *source, AudioOutput *output) return false; // Error } + // Reset error count from previous file + unrecoverable = 0; + output->SetBitsPerSample(16); // Constant for MP3 decoder output->SetChannels(2);