[asio] added reset

Author: igorkorsukov

src/framework/audio/driver/platform/win/asio/asioaudiodriver.cpp

@@ -21,6 +21,8 @@
  */
 #include "asioaudiodriver.h"
 
+#include "global/async/notification.h"
+
 #include "ASIOSDK/common/asio.h"
 #include "ASIOSDK/host/asiodrivers.h"
 
@@ -30,6 +32,7 @@ using namespace muse;
 using namespace muse::audio;
 
 struct Data {
+    // Drivers list
     AsioDrivers drivers;
 
     // ASIOInit()
@@ -62,6 +65,9 @@ struct Data {
 
     // ASIOCallbacks
     ASIOCallbacks callbacks;
+
+    // Reset
+    async::Notification resetRequest;
 };
 
 static Data s_data;
@@ -265,28 +271,29 @@ static ASIOTime* s_bufferSwitchTimeInfo(ASIOTime* /*params*/, long index, ASIOBo
     return nullptr;
 }
 
+static void s_resetRequest()
+{
+    s_data.resetRequest.notify();
+}
+
 static void s_sampleRateChanged(ASIOSampleRate rate)
 {
     LOGI() << "rate: " << rate;
+    s_resetRequest();
 }
 
-static long s_asioMessages(long selector, long value, void* message, double* /*opt*/)
+static long s_asioMessages(long selector, long value, void* /*message*/, double* /*opt*/)
 {
     LOGI() << "selector: " << selector
-           << "value: " << value
-           << "message: " << (const char*)message;
+           << " value: " << value;
 
     long ret = 0;
     switch (selector) {
     case kAsioSelectorSupported:
         if (value == kAsioEngineVersion
-            // || value == kAsioResetRequest
-            // || value == kAsioResyncRequest
-            // || value == kAsioLatenciesChanged
-            // // the following three were added for ASIO 2.0, you don't necessarily have to support them
-            // || value == kAsioSupportsTimeInfo
-            // || value == kAsioSupportsTimeCode
-            // || value == kAsioSupportsInputMonitor
+            || value == kAsioResetRequest
+            || value == kAsioResyncRequest
+            || value == kAsioLatenciesChanged
             ) {
             ret = 1L;
         }
@@ -296,22 +303,28 @@ static long s_asioMessages(long selector, long value, void* message, double* /*o
         // You cannot reset the driver right now, as this code is called from the driver.
         // Reset the driver is done by completely destruct is. I.e. ASIOStop(), ASIODisposeBuffers(), Destruction
         // Afterwards you initialize the driver again.
-        ret = 0L;
+        s_resetRequest();
+        ret = 1L;
         break;
+    case kAsioBufferSizeChange:
+        s_resetRequest();
+        ret = 1L;
     case kAsioResyncRequest:
         // This informs the application, that the driver encountered some non fatal data loss.
         // It is used for synchronization purposes of different media.
         // Added mainly to work around the Win16Mutex problems in Windows 95/98 with the
         // Windows Multimedia system, which could loose data because the Mutex was hold too long
         // by another thread.
         // However a driver can issue it in other situations, too.
+        s_resetRequest();
         ret = 1L;
         break;
     case kAsioLatenciesChanged:
         // This will inform the host application that the drivers were latencies changed.
         // Beware, it this does not mean that the buffer sizes have changed!
         // You might need to update internal delay data.
-        ret = 0L;
+        s_resetRequest();
+        ret = 1L;
         break;
     case kAsioEngineVersion:
         // return the supported ASIO version of the host application
@@ -487,6 +500,10 @@ bool AsioAudioDriver::doOpen(const AudioDeviceID& device, const Spec& spec, Spec
         return ok;
     }
 
+    s_data.resetRequest.onNotify(this, [this]() {
+        reset();
+    }, async::Asyncable::Mode::SetReplace);
+
     m_running = true;
     m_thread = std::thread([this]() {
         bool ok = ASIOStart() == ASE_OK;
@@ -530,6 +547,18 @@ void AsioAudioDriver::close()
     s_data.drivers.removeCurrentDriver();
 }
 
+void AsioAudioDriver::reset()
+{
+    LOGI() << "! driver reset called";
+    if (!isOpened()) {
+        return;
+    }
+
+    Spec spec = s_data.activeSpec;
+    close();
+    open(spec, nullptr);
+}
+
 bool AsioAudioDriver::isOpened() const
 {
     return m_running;

src/framework/audio/driver/platform/win/asio/asioaudiodriver.h

@@ -26,8 +26,10 @@
 
 #include "../../../iaudiodriver.h"
 
+#include "global/async/asyncable.h"
+
 namespace muse::audio {
-class AsioAudioDriver : public IAudioDriver
+class AsioAudioDriver : public IAudioDriver, public async::Asyncable
 {
 public:
     AsioAudioDriver();
@@ -63,6 +65,7 @@ class AsioAudioDriver : public IAudioDriver
 private:
 
     bool doOpen(const AudioDeviceID& device, const Spec& spec, Spec* activeSpec);
+    void reset();
 
     std::thread m_thread;
     std::atomic<bool> m_running = false;