flush sound if user stops playback when count-in is playing

Author: RomanPudashkin

src/framework/audio/internal/abstracteventsequencer.h

@@ -89,6 +89,20 @@ class AbstractEventSequencer : public async::Asyncable
         }
     }
 
+    void flushOffstream()
+    {
+        if (m_offStreamEvents.empty()) {
+            return;
+        }
+
+        m_offStreamEvents.clear();
+        updateOffSequenceIterator();
+
+        if (m_onOffStreamFlushed) {
+            m_onOffStreamFlushed();
+        }
+    }
+
     void setActive(const bool active)
     {
         if (m_isActive == active) {
@@ -98,11 +112,6 @@ class AbstractEventSequencer : public async::Asyncable
         m_isActive = active;
 
         if (m_isActive) {
-            if (!m_offStreamEvents.empty()) {
-                m_offStreamEvents.clear();
-                updateOffSequenceIterator();
-            }
-
             updateMainStream();
         }
     }

src/framework/audio/internal/synthesizers/fluidsynth/fluidsequencer.cpp

@@ -61,12 +61,7 @@ int FluidSequencer::naturalExpressionLevel() const
 
 void FluidSequencer::updateOffStreamEvents(const mpe::PlaybackEventsMap& events, const PlaybackParamList&)
 {
-    m_offStreamEvents.clear();
-
-    if (m_onOffStreamFlushed) {
-        m_onOffStreamFlushed();
-    }
-
+    flushOffstream();
     updatePlaybackEvents(m_offStreamEvents, events);
     updateOffSequenceIterator();
 }

src/framework/audio/internal/synthesizers/fluidsynth/fluidsynth.cpp

@@ -203,6 +203,8 @@ void FluidSynth::allNotesOff()
             port->sendEvent(e);
         }
     }
+
+    m_allNotesOffRequested = false;
 }
 
 bool FluidSynth::handleEvent(const midi::Event& event)
@@ -364,6 +366,8 @@ void FluidSynth::flushSound()
         return;
     }
 
+    m_sequencer.flushOffstream();
+
     allNotesOff();
 
     fluid_synth_all_sounds_off(m_fluid->synth, -1);
@@ -408,7 +412,6 @@ samples_t FluidSynth::process(float* buffer, samples_t samplesPerChannel)
 
     if (m_allNotesOffRequested) {
         allNotesOff();
-        m_allNotesOffRequested = false;
     }
 
     const msecs_t nextMsecs = samplesToMsecs(samplesPerChannel, m_sampleRate);

src/framework/audio/internal/worker/eventaudiosource.cpp

@@ -138,6 +138,17 @@ void EventAudioSource::seek(const msecs_t newPositionMsecs)
     m_synth->revokePlayingNotes();
 }
 
+void EventAudioSource::flush()
+{
+    ONLY_AUDIO_WORKER_THREAD;
+
+    IF_ASSERT_FAILED(m_synth) {
+        return;
+    }
+
+    m_synth->flushSound();
+}
+
 const AudioInputParams& EventAudioSource::inputParams() const
 {
     return m_params;

src/framework/audio/internal/worker/eventaudiosource.h

@@ -53,6 +53,7 @@ class EventAudioSource : public ITrackAudioInput, public muse::Injectable, publi
     samples_t process(float* buffer, samples_t samplesPerChannel) override;
 
     void seek(const msecs_t newPositionMsecs) override;
+    void flush() override;
 
     const AudioInputParams& inputParams() const override;
     void applyInputParams(const AudioInputParams& requiredParams) override;

src/framework/audio/internal/worker/sequenceplayer.cpp

@@ -38,8 +38,12 @@ SequencePlayer::SequencePlayer(IGetTracks* getTracks, IClockPtr clock, const mod
     });
 
     m_clock->statusChanged().onReceive(this, [this](const PlaybackStatus status) {
+        const bool active = status == PlaybackStatus::Running;
+
         if (!m_countDownIsSet) {
-            audioEngine()->mixer()->setIsActive(status == PlaybackStatus::Running);
+            audioEngine()->mixer()->setIsActive(active);
+        } else if (!active) {
+            flushAllTracks();
         }
     });
 
@@ -166,3 +170,16 @@ void SequencePlayer::seekAllTracks(const msecs_t newPositionMsecs)
         }
     }
 }
+
+void SequencePlayer::flushAllTracks()
+{
+    IF_ASSERT_FAILED(m_getTracks) {
+        return;
+    }
+
+    for (const auto& pair : m_getTracks->allTracks()) {
+        if (pair.second->inputHandler) {
+            pair.second->inputHandler->flush();
+        }
+    }
+}

src/framework/audio/internal/worker/sequenceplayer.h

@@ -59,6 +59,7 @@ class SequencePlayer : public ISequencePlayer, public Injectable, public async::
 
 private:
     void seekAllTracks(const msecs_t newPositionMsecs);
+    void flushAllTracks();
 
     IGetTracks* m_getTracks = nullptr;
     IClockPtr m_clock = nullptr;

src/framework/audio/internal/worker/track.h

@@ -44,6 +44,8 @@ class ITrackAudioInput : public IAudioSource
     virtual ~ITrackAudioInput() = default;
 
     virtual void seek(const msecs_t newPositionMsecs) = 0;
+    virtual void flush() = 0;
+
     virtual const AudioInputParams& inputParams() const = 0;
     virtual void applyInputParams(const AudioInputParams& requiredParams) = 0;
     virtual async::Channel<AudioInputParams> inputParamsChanged() const = 0;

src/framework/musesampler/internal/musesamplersequencer.cpp

@@ -116,11 +116,7 @@ void MuseSamplerSequencer::init(MuseSamplerLibHandlerPtr samplerLib, ms_MuseSamp
 
 void MuseSamplerSequencer::updateOffStreamEvents(const PlaybackEventsMap& events, const PlaybackParamList& params)
 {
-    m_offStreamEvents.clear();
-
-    if (m_onOffStreamFlushed) {
-        m_onOffStreamFlushed();
-    }
+    flushOffstream();
 
     parseOffStreamParams(params, m_offStreamCache);
 

src/framework/musesampler/internal/musesamplerwrapper.cpp

@@ -149,6 +149,7 @@ AudioSourceType MuseSamplerWrapper::type() const
 
 void MuseSamplerWrapper::flushSound()
 {
+    m_sequencer.flushOffstream();
     m_allNotesOffRequested = true;
 }
 

src/framework/vst/internal/synth/vstsequencer.cpp

@@ -59,12 +59,7 @@ void VstSequencer::init(ParamsMapping&& mapping, bool useDynamicEvents)
 
 void VstSequencer::updateOffStreamEvents(const mpe::PlaybackEventsMap& events, const mpe::PlaybackParamList&)
 {
-    m_offStreamEvents.clear();
-
-    if (m_onOffStreamFlushed) {
-        m_onOffStreamFlushed();
-    }
-
+    flushOffstream();
     updatePlaybackEvents(m_offStreamEvents, events);
     updateOffSequenceIterator();
 }

src/framework/vst/internal/synth/vstsynthesiser.cpp

@@ -129,6 +129,8 @@ void VstSynthesiser::revokePlayingNotes()
 
 void VstSynthesiser::flushSound()
 {
+    m_sequencer.flushOffstream();
+
     if (m_vstAudioClient) {
         m_vstAudioClient->flush();
     }