fixed audio export process

Author: igorkorsukov

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

@@ -336,7 +336,9 @@ void FluidSynth::setupSound(const PlaybackSetupData& setupData)
         fluid_synth_activate_tuning(m_fluid->synth, channelIdx, 0, 0, 0);
     };
 
-    m_sequencer.channelAdded().onReceive(this, setupChannel);
+    m_sequencer.channelAdded().onReceive(this, setupChannel,
+                                         async::Asyncable::Mode::SetReplace);
+
     m_sequencer.init(setupData, m_preset, setupData.supportsSingleNoteDynamics);
 
     for (const auto& voice : m_sequencer.channels().data()) {

src/framework/global/iapplication.h

@@ -66,6 +66,8 @@ class IApplication : MODULE_EXPORT_INTERFACE
     virtual const modularity::ContextPtr iocContext() const = 0;
     virtual modularity::ModulesIoC* ioc() const = 0;
 
+    virtual void processEvents() = 0;
+
 #ifndef NO_QT_SUPPORT
     virtual QWindow* focusWindow() const = 0;
     virtual bool notify(QObject* object, QEvent* event) = 0;

src/framework/global/internal/baseapplication.cpp

@@ -186,3 +186,9 @@ void BaseApplication::removeIoC()
     modularity::_ioc(m_iocContext)->reset();
     modularity::removeIoC(m_iocContext);
 }
+
+void BaseApplication::processEvents()
+{
+    qApp->processEvents();
+    tickerProvider()->forceSchedule();
+}

src/framework/global/internal/baseapplication.h

@@ -24,9 +24,13 @@
 
 #include "../iapplication.h"
 
+#include "modularity/ioc.h"
+#include "global/itickerprovider.h"
+
 namespace muse {
 class BaseApplication : public IApplication
 {
+    Inject<ITickerProvider> tickerProvider;
 public:
 
     BaseApplication(const modularity::ContextPtr& ctx);
@@ -56,6 +60,8 @@ class BaseApplication : public IApplication
     const modularity::ContextPtr iocContext() const override;
     modularity::ModulesIoC* ioc() const override;
 
+    void processEvents() override;
+
 #ifndef NO_QT_SUPPORT
     QWindow* focusWindow() const override;
     bool notify(QObject* object, QEvent* event) override;

src/framework/global/internal/tickerprovider.cpp

@@ -56,6 +56,15 @@ void TickerProvider::stop()
     }
 }
 
+void TickerProvider::forceSchedule()
+{
+    if (!m_timer) {
+        start();
+    } else if (!m_timer->isActive()) {
+        m_timer->start();
+    }
+}
+
 void TickerProvider::addPending()
 {
     for (const auto& p : m_pendingToAdd) {

src/framework/global/internal/tickerprovider.h

@@ -35,6 +35,7 @@ class TickerProvider : public ITickerProvider
 
     void start() override;
     void stop() override;
+    void forceSchedule() override;
 
     uint32_t /*id*/ addTask(const Task& task) override;
     void removeTask(const uint32_t& taskId) override;

src/framework/global/itickerprovider.h

@@ -40,6 +40,7 @@ class ITickerProvider : MODULE_EXPORT_INTERFACE
 
     virtual void start() = 0;
     virtual void stop() = 0;
+    virtual void forceSchedule() = 0;
 
     virtual uint32_t /*id*/ addTask(const Task& task) = 0;
     virtual void removeTask(const uint32_t& taskId) = 0;

src/framework/global/tests/mocks/applicationmock.h

@@ -56,6 +56,7 @@ class ApplicationMock : public IApplication
 
     MOCK_METHOD(const modularity::ContextPtr, iocContext, (), (const, override));
     MOCK_METHOD(modularity::ModulesIoC*, ioc, (), (const, override));
+    MOCK_METHOD(void, processEvents, (), (override));
 };
 }
 

src/importexport/audioexport/internal/abstractaudiowriter.cpp

@@ -80,6 +80,7 @@ Ret AbstractAudioWriter::writeList(const INotationPtrList&, io::IODevice&, const
 void AbstractAudioWriter::abort()
 {
     playback()->abortSavingAllSoundTracks();
+    m_isCompleted = true;
 }
 
 muse::Progress* AbstractAudioWriter::progress()
@@ -130,7 +131,7 @@ Ret AbstractAudioWriter::doWriteAndWait(INotationPtr notation,
     });
 
     while (!m_isCompleted) {
-        qApp->processEvents();
+        application()->processEvents();
         QThread::yieldCurrentThread();
     }
 
@@ -165,8 +166,9 @@ void AbstractAudioWriter::doWrite(const QString& path, const SoundTrackFormat& f
             });
         }
     })
-    .onReject(this, [](int errorCode, const std::string& msg) {
+    .onReject(this, [this](int errorCode, const std::string& msg) {
         LOGE() << "errorCode: " << errorCode << ", " << msg;
+        m_isCompleted = true;
     });
 }
 

src/importexport/audioexport/internal/abstractaudiowriter.h

@@ -28,6 +28,7 @@
 #include "iaudioexportconfiguration.h"
 #include "context/iglobalcontext.h"
 #include "playback/iplaybackcontroller.h"
+#include "global/iapplication.h"
 
 #include "project/inotationwriter.h"
 
@@ -39,6 +40,7 @@ class AbstractAudioWriter : public project::INotationWriter, public muse::Inject
     muse::Inject<IAudioExportConfiguration> configuration = { this };
     muse::Inject<context::IGlobalContext> globalContext = { this };
     muse::Inject<playback::IPlaybackController> playbackController  = { this };
+    muse::Inject<muse::IApplication> application  = { this };
 
 public:
     AbstractAudioWriter(const muse::modularity::ContextPtr& iocCtx)