From 87fbcadd8036c6d5f320a61f52c63a591267e013 Mon Sep 17 00:00:00 2001 From: Maigre Date: Sat, 13 Apr 2019 01:17:10 +0200 Subject: [PATCH] Call output->stop() when stopping generators (#174) * Fix hanging sound on WAV stop for ESP32 * Fix hanging sound on AAC stop for ESP32 * Fix hanging sound on MIDI stop for ESP32 * Fix hanging sound on MOD stop for ESP32 * Fix hanging sound on MP3a stop for ESP32 * Fix hanging sound on RTTTL stop for ESP32 --- src/AudioGeneratorFLAC.cpp | 2 +- src/AudioGeneratorMIDI.cpp | 1 + src/AudioGeneratorMOD.cpp | 1 + src/AudioGeneratorMP3a.cpp | 1 + src/AudioGeneratorRTTTL.cpp | 1 + src/AudioGeneratorWAV.cpp | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/AudioGeneratorFLAC.cpp b/src/AudioGeneratorFLAC.cpp index db9daca..3b21712 100644 --- a/src/AudioGeneratorFLAC.cpp +++ b/src/AudioGeneratorFLAC.cpp @@ -126,7 +126,7 @@ bool AudioGeneratorFLAC::stop() FLAC__stream_decoder_delete(flac); flac = NULL; running = false; - + output->stop(); return true; } diff --git a/src/AudioGeneratorMIDI.cpp b/src/AudioGeneratorMIDI.cpp index 970b04d..bdc37a0 100644 --- a/src/AudioGeneratorMIDI.cpp +++ b/src/AudioGeneratorMIDI.cpp @@ -585,6 +585,7 @@ done: bool AudioGeneratorMIDI::stop() { StopMIDI(); + output->stop(); return true; } diff --git a/src/AudioGeneratorMOD.cpp b/src/AudioGeneratorMOD.cpp index e9c0928..f42154f 100644 --- a/src/AudioGeneratorMOD.cpp +++ b/src/AudioGeneratorMOD.cpp @@ -71,6 +71,7 @@ bool AudioGeneratorMOD::stop() } if (file) file->close(); running = false; + output->stop(); return true; } diff --git a/src/AudioGeneratorMP3a.cpp b/src/AudioGeneratorMP3a.cpp index 63eac10..d256822 100644 --- a/src/AudioGeneratorMP3a.cpp +++ b/src/AudioGeneratorMP3a.cpp @@ -53,6 +53,7 @@ bool AudioGeneratorMP3a::stop() { if (!running) return true; running = false; + output->stop(); return file->close(); } diff --git a/src/AudioGeneratorRTTTL.cpp b/src/AudioGeneratorRTTTL.cpp index b45254b..c30b895 100644 --- a/src/AudioGeneratorRTTTL.cpp +++ b/src/AudioGeneratorRTTTL.cpp @@ -43,6 +43,7 @@ bool AudioGeneratorRTTTL::stop() { if (!running) return true; running = false; + output->stop(); return file->close(); } diff --git a/src/AudioGeneratorWAV.cpp b/src/AudioGeneratorWAV.cpp index b32240a..cdd5229 100644 --- a/src/AudioGeneratorWAV.cpp +++ b/src/AudioGeneratorWAV.cpp @@ -44,6 +44,7 @@ bool AudioGeneratorWAV::stop() running = false; free(buff); buff = NULL; + output->stop(); return file->close(); }