moved logic to audio driver controller

Author: igorkorsukov

src/appshell/view/preferences/commonaudioapiconfigurationmodel.cpp

@@ -41,6 +41,7 @@ void CommonAudioApiConfigurationModel::load()
     audioDriverController()->currentAudioApiChanged().onNotify(this, [this]() {
         emit deviceListChanged();
         emit currentDeviceIdChanged();
+        emit sampleRateListChanged();
         emit sampleRateChanged();
         emit bufferSizeListChanged();
         emit bufferSizeChanged();
@@ -53,6 +54,7 @@ void CommonAudioApiConfigurationModel::load()
 
     audioDriverController()->outputDeviceChanged().onNotify(this, [this]() {
         emit currentDeviceIdChanged();
+        emit sampleRateListChanged();
         emit sampleRateChanged();
         emit bufferSizeListChanged();
         emit bufferSizeChanged();
@@ -69,7 +71,8 @@ void CommonAudioApiConfigurationModel::load()
 
 QString CommonAudioApiConfigurationModel::currentDeviceId() const
 {
-    return QString::fromStdString(audioDriverController()->outputDevice());
+    AudioDeviceID device = audioDriverController()->outputDevice();
+    return QString::fromStdString(device);
 }
 
 QVariantList CommonAudioApiConfigurationModel::deviceList() const
@@ -106,10 +109,10 @@ unsigned int CommonAudioApiConfigurationModel::bufferSize() const
 QList<unsigned int> CommonAudioApiConfigurationModel::bufferSizeList() const
 {
     QList<unsigned int> result;
-    std::vector<unsigned int> bufferSizes = audioDriverController()->availableOutputDeviceBufferSizes();
+    std::vector<samples_t> bufferSizes = audioDriverController()->availableOutputDeviceBufferSizes();
 
-    for (unsigned int bufferSize : bufferSizes) {
-        result << bufferSize;
+    for (samples_t bufferSize : bufferSizes) {
+        result << static_cast<unsigned int>(bufferSize);
     }
 
     return result;
@@ -128,10 +131,10 @@ unsigned int CommonAudioApiConfigurationModel::sampleRate() const
 QList<unsigned int> CommonAudioApiConfigurationModel::sampleRateList() const
 {
     QList<unsigned int> result;
-    std::vector<unsigned int> sampleRates = audioDriverController()->availableOutputDeviceSampleRates();
+    std::vector<sample_rate_t> sampleRates = audioDriverController()->availableOutputDeviceSampleRates();
 
-    for (unsigned int sampleRate : sampleRates) {
-        result << sampleRate;
+    for (sample_rate_t sampleRate : sampleRates) {
+        result << static_cast<unsigned int>(sampleRate);
     }
 
     return result;

src/framework/audio/driver/audio_driver.cmake

@@ -27,13 +27,13 @@ if (OS_IS_WIN)
         #${CMAKE_CURRENT_LIST_DIR}/platform/win/winmmdriver.h
         #${CMAKE_CURRENT_LIST_DIR}/platform/win/wincoreaudiodriver.cpp
         #${CMAKE_CURRENT_LIST_DIR}/platform/win/wincoreaudiodriver.h
-        ${CMAKE_CURRENT_LIST_DIR}/platform/win/wasapiaudioclient.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/platform/win/wasapiaudioclient.h
-        ${CMAKE_CURRENT_LIST_DIR}/platform/win/wasapitypes.h
-        ${CMAKE_CURRENT_LIST_DIR}/platform/win/wasapiaudiodriver.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/platform/win/wasapiaudiodriver.h
-        ${CMAKE_CURRENT_LIST_DIR}/platform/win/audiodeviceslistener.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/platform/win/audiodeviceslistener.h
+        # ${CMAKE_CURRENT_LIST_DIR}/platform/win/wasapiaudioclient.cpp
+        # ${CMAKE_CURRENT_LIST_DIR}/platform/win/wasapiaudioclient.h
+        # ${CMAKE_CURRENT_LIST_DIR}/platform/win/wasapitypes.h
+        # ${CMAKE_CURRENT_LIST_DIR}/platform/win/wasapiaudiodriver.cpp
+        # ${CMAKE_CURRENT_LIST_DIR}/platform/win/wasapiaudiodriver.h
+        # ${CMAKE_CURRENT_LIST_DIR}/platform/win/audiodeviceslistener.cpp
+        # ${CMAKE_CURRENT_LIST_DIR}/platform/win/audiodeviceslistener.h
         ${CMAKE_CURRENT_LIST_DIR}/platform/win/wasapiaudiodriver2.cpp
         ${CMAKE_CURRENT_LIST_DIR}/platform/win/wasapiaudiodriver2.h
     )

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

@@ -125,7 +125,7 @@ static void s_bufferSwitch(long index, ASIOBool /*processNow*/)
     }
 
     uint8_t* stream = reinterpret_cast<uint8_t*>(&proc_buf[0]);
-    active.callback(nullptr, stream, (int)(procSamplesTotal * sizeof(float)));
+    active.callback(stream, (int)(procSamplesTotal * sizeof(float)));
 
     constexpr float MAX_S16 = 32767.0f;
     constexpr float MAX_S18 = 131071.0f;
@@ -397,23 +397,23 @@ static ASIOError create_asio_buffers(long bufferSize, long outputChannels, long
     return ASE_OK;
 }
 
-bool AsioAudioDriver::open(const Spec& spec, Spec* activeSpec)
+AudioDeviceID AsioAudioDriver::defaultDevice() const
 {
-    if (m_deviceId.empty()) {
-        AudioDeviceList devices = availableOutputDevices();
-        if (devices.empty()) {
-            return false;
-        }
-        m_deviceId = devices.at(0).id;
+    AudioDeviceList devices = availableOutputDevices();
+    if (devices.empty()) {
+        return AudioDeviceID();
     }
-
-    return doOpen(m_deviceId, spec, activeSpec);
+    return devices.at(0).id;
 }
 
-bool AsioAudioDriver::doOpen(const AudioDeviceID& device, const Spec& spec, Spec* activeSpec)
+bool AsioAudioDriver::open(const Spec& spec, Spec* activeSpec)
 {
-    LOGI() << "try open: " << device;
-    const char* name = device.c_str();
+    LOGI() << "try open: " << spec.deviceId;
+    IF_ASSERT_FAILED(!spec.deviceId.empty()) {
+        return false;
+    }
+
+    const char* name = spec.deviceId.c_str();
     bool ok = s_adata.drivers.loadDriver(const_cast<char*>(name));
     if (!ok) {
         LOGE() << "failed load driver: " << name;
@@ -579,53 +579,7 @@ async::Channel<AsioAudioDriver::Spec> AsioAudioDriver::activeSpecChanged() const
     return m_activeSpecChanged;
 }
 
-bool AsioAudioDriver::setOutputDeviceBufferSize(unsigned int bufferSize)
-{
-    bool result = true;
-
-    if (isOpened()) {
-        close();
-        Spec spec = s_adata.activeSpec;
-        spec.output.samplesPerChannel = bufferSize;
-        result = open(spec, nullptr);
-    }
-
-    if (result) {
-        m_outputDeviceBufferSizeChanged.notify();
-    }
-
-    return result;
-}
-
-async::Notification AsioAudioDriver::outputDeviceBufferSizeChanged() const
-{
-    return m_outputDeviceBufferSizeChanged;
-}
-
-bool AsioAudioDriver::setOutputDeviceSampleRate(unsigned int sampleRate)
-{
-    bool result = true;
-
-    if (isOpened()) {
-        close();
-        Spec spec = s_adata.activeSpec;
-        spec.output.sampleRate = sampleRate;
-        result = open(spec, nullptr);
-    }
-
-    if (result) {
-        m_outputDeviceSampleRateChanged.notify();
-    }
-
-    return result;
-}
-
-async::Notification AsioAudioDriver::outputDeviceSampleRateChanged() const
-{
-    return m_outputDeviceSampleRateChanged;
-}
-
-std::vector<unsigned int> AsioAudioDriver::availableOutputDeviceBufferSizes() const
+std::vector<samples_t> AsioAudioDriver::availableOutputDeviceBufferSizes() const
 {
     if (!isOpened()) {
         return {
@@ -637,69 +591,27 @@ std::vector<unsigned int> AsioAudioDriver::availableOutputDeviceBufferSizes() co
         };
     }
 
-    std::vector<unsigned int> result;
+    std::vector<samples_t> result;
 
     samples_t n = s_adata.deviceMetrics.maxSize;
     samples_t min = s_adata.deviceMetrics.minSize;
 
     while (n >= min) {
-        result.push_back(static_cast<unsigned int>(n));
+        result.push_back(n);
         n /= 2;
     }
 
     return result;
 }
 
-std::vector<unsigned int> AsioAudioDriver::availableOutputDeviceSampleRates() const
+std::vector<sample_rate_t> AsioAudioDriver::availableOutputDeviceSampleRates() const
 {
     return {
         44100,
         48000
     };
 }
 
-AudioDeviceID AsioAudioDriver::outputDevice() const
-{
-    return m_deviceId;
-}
-
-bool AsioAudioDriver::selectOutputDevice(const AudioDeviceID& id)
-{
-    bool result = true;
-
-    if (m_deviceId == id) {
-        return result;
-    }
-
-    m_deviceId = id;
-
-    if (isOpened()) {
-        close();
-        Spec spec = s_adata.activeSpec;
-
-        //! NOTE We are trying to open a new device with the default value;
-        //! it is not known what it was before.
-        spec.output.samplesPerChannel = DEFAULT_BUFFER_SIZE;
-        result = open(spec, nullptr);
-    }
-
-    if (result) {
-        m_outputDeviceChanged.notify();
-    }
-
-    return result;
-}
-
-bool AsioAudioDriver::resetToDefaultOutputDevice()
-{
-    return selectOutputDevice(AudioDeviceID());
-}
-
-async::Notification AsioAudioDriver::outputDeviceChanged() const
-{
-    return m_outputDeviceChanged;
-}
-
 AudioDeviceList AsioAudioDriver::availableOutputDevices() const
 {
     char names[16][32];
@@ -727,11 +639,3 @@ async::Notification AsioAudioDriver::availableOutputDevicesChanged() const
 {
     return m_availableOutputDevicesChanged;
 }
-
-void AsioAudioDriver::resume()
-{
-}
-
-void AsioAudioDriver::suspend()
-{
-}

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

@@ -37,46 +37,29 @@ class AsioAudioDriver : public IAudioDriver, public async::Asyncable
     void init() override;
 
     std::string name() const override;
+
+    AudioDeviceID defaultDevice() const override;
+
     bool open(const Spec& spec, Spec* activeSpec) override;
     void close() override;
     bool isOpened() const override;
 
     const Spec& activeSpec() const override;
     async::Channel<Spec> activeSpecChanged() const override;
 
-    bool setOutputDeviceBufferSize(unsigned int bufferSize) override;
-    async::Notification outputDeviceBufferSizeChanged() const override;
-    bool setOutputDeviceSampleRate(unsigned int sampleRate) override;
-    async::Notification outputDeviceSampleRateChanged() const override;
-    std::vector<unsigned int> availableOutputDeviceBufferSizes() const override;
-    std::vector<unsigned int> availableOutputDeviceSampleRates() const override;
-
-    AudioDeviceID outputDevice() const override;
-    bool selectOutputDevice(const AudioDeviceID& id) override;
-    bool resetToDefaultOutputDevice() override;
-    async::Notification outputDeviceChanged() const override;
-
+    std::vector<samples_t> availableOutputDeviceBufferSizes() const override;
+    std::vector<sample_rate_t> availableOutputDeviceSampleRates() const override;
     AudioDeviceList availableOutputDevices() const override;
     async::Notification availableOutputDevicesChanged() const override;
 
-    void resume() override;
-    void suspend() override;
-
 private:
 
-    bool doOpen(const AudioDeviceID& device, const Spec& spec, Spec* activeSpec);
     void reset();
 
     std::thread m_thread;
     std::atomic<bool> m_running = false;
 
-    AudioDeviceID m_deviceId;
-    async::Notification m_outputDeviceChanged;
-    async::Notification m_availableOutputDevicesChanged;
-
     async::Channel<Spec> m_activeSpecChanged;
-
-    async::Notification m_outputDeviceBufferSizeChanged;
-    async::Notification m_outputDeviceSampleRateChanged;
+    async::Notification m_availableOutputDevicesChanged;
 };
 }