From e2aabde641ff77a7fe36739a3fa16d981961cfbd Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 23 Mar 2018 18:08:38 +0100
Subject: [PATCH] Multiple audio support: renamed AudioDeviceInfo to
 AudioDeviceManager

---
 sdrbase/CMakeLists.txt                        |  4 +-
 ...odeviceinfo.cpp => audiodevicemanager.cpp} | 40 +++++++++----------
 ...audiodeviceinfo.h => audiodevicemanager.h} | 10 ++---
 sdrbase/dsp/dspengine.h                       |  6 +--
 sdrbase/settings/mainsettings.cpp             | 10 ++---
 sdrbase/settings/mainsettings.h               |  8 ++--
 sdrgui/gui/audiodialog.cpp                    |  5 ++-
 sdrgui/gui/audiodialog.h                      |  6 +--
 sdrgui/mainwindow.cpp                         | 14 ++++---
 sdrgui/webapi/webapiadaptergui.cpp            | 26 ++++++------
 sdrsrv/maincore.cpp                           |  2 +-
 sdrsrv/webapi/webapiadaptersrv.cpp            | 26 ++++++------
 12 files changed, 80 insertions(+), 77 deletions(-)
 rename sdrbase/audio/{audiodeviceinfo.cpp => audiodevicemanager.cpp} (76%)
 rename sdrbase/audio/{audiodeviceinfo.h => audiodevicemanager.h} (92%)

diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt
index c56bc4cba..cfae2ff19 100644
--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@@ -3,7 +3,7 @@ project (sdrbase)
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined")
 
 set(sdrbase_SOURCES
-    audio/audiodeviceinfo.cpp
+    audio/audiodevicemanager.cpp
     audio/audiofifo.cpp
     audio/audiooutput.cpp
     audio/audioinput.cpp
@@ -84,7 +84,7 @@ set(sdrbase_SOURCES
 )
 
 set(sdrbase_HEADERS
-    audio/audiodeviceinfo.h
+    audio/audiodevicemanager.h
     audio/audiofifo.h
     audio/audiooutput.h
     audio/audioinput.h
diff --git a/sdrbase/audio/audiodeviceinfo.cpp b/sdrbase/audio/audiodevicemanager.cpp
similarity index 76%
rename from sdrbase/audio/audiodeviceinfo.cpp
rename to sdrbase/audio/audiodevicemanager.cpp
index b803ae400..f5779ce60 100644
--- a/sdrbase/audio/audiodeviceinfo.cpp
+++ b/sdrbase/audio/audiodevicemanager.cpp
@@ -15,10 +15,10 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "audio/audiodeviceinfo.h"
+#include <audio/audiodevicemanager.h>
 #include "util/simpleserializer.h"
 
-AudioDeviceInfo::AudioDeviceInfo() :
+AudioDeviceManager::AudioDeviceManager() :
     m_inputDeviceIndex(-1),  // default device
     m_outputDeviceIndex(-1), // default device
     m_audioOutputSampleRate(48000), // Use default output device at 48 kHz
@@ -29,14 +29,14 @@ AudioDeviceInfo::AudioDeviceInfo() :
     m_outputDevicesInfo = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
 }
 
-void AudioDeviceInfo::resetToDefaults()
+void AudioDeviceManager::resetToDefaults()
 {
     m_inputDeviceIndex = -1;
     m_outputDeviceIndex = -1;
     m_inputVolume = 1.0f;
 }
 
-QByteArray AudioDeviceInfo::serialize() const
+QByteArray AudioDeviceManager::serialize() const
 {
     SimpleSerializer s(1);
     s.writeS32(1, m_inputDeviceIndex);
@@ -45,7 +45,7 @@ QByteArray AudioDeviceInfo::serialize() const
     return s.final();
 }
 
-bool AudioDeviceInfo::deserialize(const QByteArray& data)
+bool AudioDeviceManager::deserialize(const QByteArray& data)
 {
     SimpleDeserializer d(data);
 
@@ -68,87 +68,87 @@ bool AudioDeviceInfo::deserialize(const QByteArray& data)
     }
 }
 
-void AudioDeviceInfo::setInputDeviceIndex(int inputDeviceIndex)
+void AudioDeviceManager::setInputDeviceIndex(int inputDeviceIndex)
 {
     int nbDevices = m_inputDevicesInfo.size();
     m_inputDeviceIndex = inputDeviceIndex < -1 ? -1 : inputDeviceIndex >= nbDevices ? nbDevices-1 : inputDeviceIndex;
 }
 
-void AudioDeviceInfo::setOutputDeviceIndex(int outputDeviceIndex)
+void AudioDeviceManager::setOutputDeviceIndex(int outputDeviceIndex)
 {
     int nbDevices = m_outputDevicesInfo.size();
     m_outputDeviceIndex = outputDeviceIndex < -1 ? -1 : outputDeviceIndex >= nbDevices ? nbDevices-1 : outputDeviceIndex;
 }
 
-void AudioDeviceInfo::setInputVolume(float inputVolume)
+void AudioDeviceManager::setInputVolume(float inputVolume)
 {
     m_inputVolume = inputVolume < 0.0 ? 0.0 : inputVolume > 1.0 ? 1.0 : inputVolume;
 }
 
-void AudioDeviceInfo::addAudioSink(AudioFifo* audioFifo)
+void AudioDeviceManager::addAudioSink(AudioFifo* audioFifo)
 {
     qDebug("AudioDeviceInfo::addAudioSink");
     m_audioOutput.addFifo(audioFifo);
 }
 
-void AudioDeviceInfo::removeAudioSink(AudioFifo* audioFifo)
+void AudioDeviceManager::removeAudioSink(AudioFifo* audioFifo)
 {
     qDebug("AudioDeviceInfo::removeAudioSink");
     m_audioOutput.removeFifo(audioFifo);
 }
 
-void AudioDeviceInfo::addAudioSource(AudioFifo* audioFifo)
+void AudioDeviceManager::addAudioSource(AudioFifo* audioFifo)
 {
     qDebug("AudioDeviceInfo::addAudioSource");
     m_audioInput.addFifo(audioFifo);
 }
 
-void AudioDeviceInfo::removeAudioSource(AudioFifo* audioFifo)
+void AudioDeviceManager::removeAudioSource(AudioFifo* audioFifo)
 {
     qDebug("AudioDeviceInfo::removeAudioSource");
     m_audioInput.removeFifo(audioFifo);
 }
 
-void AudioDeviceInfo::startAudioOutput()
+void AudioDeviceManager::startAudioOutput()
 {
     m_audioOutput.start(m_outputDeviceIndex, m_audioOutputSampleRate);
     m_audioOutputSampleRate = m_audioOutput.getRate(); // update with actual rate
 }
 
-void AudioDeviceInfo::stopAudioOutput()
+void AudioDeviceManager::stopAudioOutput()
 {
     m_audioOutput.stop();
 }
 
-void AudioDeviceInfo::startAudioOutputImmediate()
+void AudioDeviceManager::startAudioOutputImmediate()
 {
     m_audioOutput.startImmediate(m_outputDeviceIndex, m_audioOutputSampleRate);
     m_audioOutputSampleRate = m_audioOutput.getRate(); // update with actual rate
 }
 
-void AudioDeviceInfo::stopAudioOutputImmediate()
+void AudioDeviceManager::stopAudioOutputImmediate()
 {
     m_audioOutput.stopImmediate();
 }
 
-void AudioDeviceInfo::startAudioInput()
+void AudioDeviceManager::startAudioInput()
 {
     m_audioInput.start(m_inputDeviceIndex, m_audioInputSampleRate);
     m_audioInputSampleRate = m_audioInput.getRate(); // update with actual rate
 }
 
-void AudioDeviceInfo::stopAudioInput()
+void AudioDeviceManager::stopAudioInput()
 {
     m_audioInput.stop();
 }
 
-void AudioDeviceInfo::startAudioInputImmediate()
+void AudioDeviceManager::startAudioInputImmediate()
 {
     m_audioInput.startImmediate(m_inputDeviceIndex, m_audioInputSampleRate);
     m_audioInputSampleRate = m_audioInput.getRate(); // update with actual rate
 }
 
-void AudioDeviceInfo::stopAudioInputImmediate()
+void AudioDeviceManager::stopAudioInputImmediate()
 {
     m_audioInput.stopImmediate();
 }
diff --git a/sdrbase/audio/audiodeviceinfo.h b/sdrbase/audio/audiodevicemanager.h
similarity index 92%
rename from sdrbase/audio/audiodeviceinfo.h
rename to sdrbase/audio/audiodevicemanager.h
index e66721e47..e6a2ff6c9 100644
--- a/sdrbase/audio/audiodeviceinfo.h
+++ b/sdrbase/audio/audiodevicemanager.h
@@ -15,8 +15,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#ifndef INCLUDE_AUDIODEVICEINFO_H
-#define INCLUDE_AUDIODEVICEINFO_H
+#ifndef INCLUDE_AUDIODEVICEMANGER_H
+#define INCLUDE_AUDIODEVICEMANGER_H
 
 #include <QStringList>
 #include <QList>
@@ -28,9 +28,9 @@
 
 class AudioFifo;
 
-class SDRBASE_API AudioDeviceInfo {
+class SDRBASE_API AudioDeviceManager {
 public:
-	AudioDeviceInfo();
+	AudioDeviceManager();
 
 	const QList<QAudioDeviceInfo>& getInputDevices() const { return m_inputDevicesInfo; }
     const QList<QAudioDeviceInfo>& getOutputDevices() const { return m_outputDevicesInfo; }
@@ -81,4 +81,4 @@ private:
 	friend class MainSettings;
 };
 
-#endif // INCLUDE_AUDIODEVICEINFO_H
+#endif // INCLUDE_AUDIODEVICEMANGER_H
diff --git a/sdrbase/dsp/dspengine.h b/sdrbase/dsp/dspengine.h
index 87dc80b96..273ff693e 100644
--- a/sdrbase/dsp/dspengine.h
+++ b/sdrbase/dsp/dspengine.h
@@ -18,11 +18,11 @@
 #ifndef INCLUDE_DSPENGINE_H
 #define INCLUDE_DSPENGINE_H
 
+#include <audio/audiodevicemanager.h>
 #include <QObject>
 #include <QTimer>
 
 #include <vector>
-#include "audio/audiodeviceinfo.h"
 #include "audio/audiooutput.h"
 #include "audio/audioinput.h"
 #include "export.h"
@@ -49,7 +49,7 @@ public:
 	DSPDeviceSinkEngine *addDeviceSinkEngine();
 	void removeLastDeviceSinkEngine();
 
-	AudioDeviceInfo *getAudioDeviceInfo() { return &m_audioDeviceInfo; }
+	AudioDeviceManager *getAudioDeviceManager() { return &m_audioDeviceManager; }
 	void startAudioOutput();
 	void stopAudioOutput();
     void startAudioOutputImmediate();
@@ -95,7 +95,7 @@ private:
 	uint m_deviceSourceEnginesUIDSequence;
 	std::vector<DSPDeviceSinkEngine*> m_deviceSinkEngines;
 	uint m_deviceSinkEnginesUIDSequence;
-    AudioDeviceInfo m_audioDeviceInfo;
+    AudioDeviceManager m_audioDeviceManager;
 	AudioOutput m_audioOutput;
 	AudioInput m_audioInput;
 	uint m_audioOutputSampleRate;
diff --git a/sdrbase/settings/mainsettings.cpp b/sdrbase/settings/mainsettings.cpp
index 5a13dfc74..9627280be 100644
--- a/sdrbase/settings/mainsettings.cpp
+++ b/sdrbase/settings/mainsettings.cpp
@@ -4,7 +4,7 @@
 #include "settings/mainsettings.h"
 #include "commands/command.h"
 
-MainSettings::MainSettings() : m_audioDeviceInfo(0)
+MainSettings::MainSettings() : m_audioDeviceManager(0)
 {
 	resetToDefaults();
 }
@@ -29,9 +29,9 @@ void MainSettings::load()
 	m_preferences.deserialize(qUncompress(QByteArray::fromBase64(s.value("preferences").toByteArray())));
 	m_workingPreset.deserialize(qUncompress(QByteArray::fromBase64(s.value("current").toByteArray())));
 
-	if (m_audioDeviceInfo)
+	if (m_audioDeviceManager)
 	{
-	    m_audioDeviceInfo->deserialize(qUncompress(QByteArray::fromBase64(s.value("audio").toByteArray())));
+	    m_audioDeviceManager->deserialize(qUncompress(QByteArray::fromBase64(s.value("audio").toByteArray())));
 	}
 
 	QStringList groups = s.childGroups();
@@ -80,9 +80,9 @@ void MainSettings::save() const
 	s.setValue("preferences", qCompress(m_preferences.serialize()).toBase64());
 	s.setValue("current", qCompress(m_workingPreset.serialize()).toBase64());
 
-	if (m_audioDeviceInfo)
+	if (m_audioDeviceManager)
 	{
-	    s.setValue("audio", qCompress(m_audioDeviceInfo->serialize()).toBase64());
+	    s.setValue("audio", qCompress(m_audioDeviceManager->serialize()).toBase64());
 	}
 
 	QStringList groups = s.childGroups();
diff --git a/sdrbase/settings/mainsettings.h b/sdrbase/settings/mainsettings.h
index b348462a4..3e9fbee2e 100644
--- a/sdrbase/settings/mainsettings.h
+++ b/sdrbase/settings/mainsettings.h
@@ -1,10 +1,10 @@
 #ifndef INCLUDE_SETTINGS_H
 #define INCLUDE_SETTINGS_H
 
+#include <audio/audiodevicemanager.h>
 #include <QString>
 #include "preferences.h"
 #include "preset.h"
-#include "audio/audiodeviceinfo.h"
 #include "export.h"
 
 class Command;
@@ -57,12 +57,12 @@ public:
     bool getUseLogFile() const { return m_preferences.getUseLogFile(); }
     const QString& getLogFileName() const { return m_preferences.getLogFileName(); }
 
-	const AudioDeviceInfo *getAudioDeviceInfo() const { return m_audioDeviceInfo; }
-	void setAudioDeviceInfo(AudioDeviceInfo *audioDeviceInfo) { m_audioDeviceInfo = audioDeviceInfo; }
+	const AudioDeviceManager *getAudioDeviceManager() const { return m_audioDeviceManager; }
+	void setAudioDeviceManager(AudioDeviceManager *audioDeviceManager) { m_audioDeviceManager = audioDeviceManager; }
 
 protected:
 	Preferences m_preferences;
-	AudioDeviceInfo *m_audioDeviceInfo;
+	AudioDeviceManager *m_audioDeviceManager;
 	Preset m_workingPreset;
 	typedef QList<Preset*> Presets;
 	Presets m_presets;
diff --git a/sdrgui/gui/audiodialog.cpp b/sdrgui/gui/audiodialog.cpp
index c8874cfa7..c19a8c92f 100644
--- a/sdrgui/gui/audiodialog.cpp
+++ b/sdrgui/gui/audiodialog.cpp
@@ -1,9 +1,10 @@
 #include <gui/audiodialog.h>
+
+#include <audio/audiodevicemanager.h>
 #include <QTreeWidgetItem>
 #include "ui_audiodialog.h"
-#include "audio/audiodeviceinfo.h"
 
-AudioDialog::AudioDialog(AudioDeviceInfo* audioDeviceInfo, QWidget* parent) :
+AudioDialog::AudioDialog(AudioDeviceManager* audioDeviceInfo, QWidget* parent) :
 	QDialog(parent),
 	ui(new Ui::AudioDialog),
 	m_audioDeviceInfo(audioDeviceInfo)
diff --git a/sdrgui/gui/audiodialog.h b/sdrgui/gui/audiodialog.h
index bd0c51022..2355fb76f 100644
--- a/sdrgui/gui/audiodialog.h
+++ b/sdrgui/gui/audiodialog.h
@@ -5,7 +5,7 @@
 
 #include "export.h"
 
-class AudioDeviceInfo;
+class AudioDeviceManager;
 
 namespace Ui {
 	class AudioDialog;
@@ -15,13 +15,13 @@ class SDRGUI_API AudioDialog : public QDialog {
 	Q_OBJECT
 
 public:
-	explicit AudioDialog(AudioDeviceInfo* audioDeviceInfo, QWidget* parent = NULL);
+	explicit AudioDialog(AudioDeviceManager* audioDeviceInfo, QWidget* parent = NULL);
 	~AudioDialog();
 
 private:
 	Ui::AudioDialog* ui;
 
-	AudioDeviceInfo* m_audioDeviceInfo;
+	AudioDeviceManager* m_audioDeviceInfo;
 	float m_inputVolume;
 
 private slots:
diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index 73adb2c0f..f2ce9636f 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -34,7 +34,6 @@
 #include "device/devicesinkapi.h"
 #include "device/deviceuiset.h"
 #include "device/deviceenumerator.h"
-#include "audio/audiodeviceinfo.h"
 #include "gui/indicator.h"
 #include "gui/presetitem.h"
 #include "gui/commanditem.h"
@@ -64,6 +63,9 @@
 #include "commands/command.h"
 
 #include "mainwindow.h"
+
+#include <audio/audiodevicemanager.h>
+
 #include "ui_mainwindow.h"
 
 #include <string>
@@ -97,7 +99,7 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse
 	qDebug() << "MainWindow::MainWindow: start";
 
     m_instance = this;
-	m_settings.setAudioDeviceInfo(m_dspEngine->getAudioDeviceInfo());
+	m_settings.setAudioDeviceManager(m_dspEngine->getAudioDeviceManager());
 
 	ui->setupUi(this);
 	createStatusBar();
@@ -1412,11 +1414,11 @@ void MainWindow::on_action_Loaded_Plugins_triggered()
 
 void MainWindow::on_action_Audio_triggered()
 {
-	AudioDialog audioDialog(m_dspEngine->getAudioDeviceInfo(), this);
+	AudioDialog audioDialog(m_dspEngine->getAudioDeviceManager(), this);
 	audioDialog.exec();
-	m_dspEngine->setAudioInputVolume(m_dspEngine->getAudioDeviceInfo()->getInputVolume());
-	m_dspEngine->setAudioInputDeviceIndex(m_dspEngine->getAudioDeviceInfo()->getInputDeviceIndex());
-	m_dspEngine->setAudioOutputDeviceIndex(m_dspEngine->getAudioDeviceInfo()->getOutputDeviceIndex());
+	m_dspEngine->setAudioInputVolume(m_dspEngine->getAudioDeviceManager()->getInputVolume());
+	m_dspEngine->setAudioInputDeviceIndex(m_dspEngine->getAudioDeviceManager()->getInputDeviceIndex());
+	m_dspEngine->setAudioOutputDeviceIndex(m_dspEngine->getAudioDeviceManager()->getOutputDeviceIndex());
 }
 
 void MainWindow::on_action_Logging_triggered()
diff --git a/sdrgui/webapi/webapiadaptergui.cpp b/sdrgui/webapi/webapiadaptergui.cpp
index f38c3eb4c..357d5b3c8 100644
--- a/sdrgui/webapi/webapiadaptergui.cpp
+++ b/sdrgui/webapi/webapiadaptergui.cpp
@@ -227,17 +227,17 @@ int WebAPIAdapterGUI::instanceAudioGet(
         SWGSDRangel::SWGAudioDevices& response,
         SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
 {
-    const QList<QAudioDeviceInfo>& audioInputDevices = m_mainWindow.m_dspEngine->getAudioDeviceInfo()->getInputDevices();
-    const QList<QAudioDeviceInfo>& audioOutputDevices = m_mainWindow.m_dspEngine->getAudioDeviceInfo()->getOutputDevices();
+    const QList<QAudioDeviceInfo>& audioInputDevices = m_mainWindow.m_dspEngine->getAudioDeviceManager()->getInputDevices();
+    const QList<QAudioDeviceInfo>& audioOutputDevices = m_mainWindow.m_dspEngine->getAudioDeviceManager()->getOutputDevices();
     int nbInputDevices = audioInputDevices.size();
     int nbOutputDevices = audioOutputDevices.size();
 
     response.init();
     response.setNbInputDevices(nbInputDevices);
-    response.setInputDeviceSelectedIndex(m_mainWindow.m_dspEngine->getAudioDeviceInfo()->getInputDeviceIndex());
+    response.setInputDeviceSelectedIndex(m_mainWindow.m_dspEngine->getAudioDeviceManager()->getInputDeviceIndex());
     response.setNbOutputDevices(nbOutputDevices);
-    response.setOutputDeviceSelectedIndex(m_mainWindow.m_dspEngine->getAudioDeviceInfo()->getOutputDeviceIndex());
-    response.setInputVolume(m_mainWindow.m_dspEngine->getAudioDeviceInfo()->getInputVolume());
+    response.setOutputDeviceSelectedIndex(m_mainWindow.m_dspEngine->getAudioDeviceManager()->getOutputDeviceIndex());
+    response.setInputVolume(m_mainWindow.m_dspEngine->getAudioDeviceManager()->getInputVolume());
     QList<SWGSDRangel::SWGAudioDevice*> *inputDevices = response.getInputDevices();
     QList<SWGSDRangel::SWGAudioDevice*> *outputDevices = response.getOutputDevices();
 
@@ -267,8 +267,8 @@ int WebAPIAdapterGUI::instanceAudioPatch(
     int inputIndex = response.getInputIndex();
     int outputIndex = response.getOutputIndex();
 
-    const QList<QAudioDeviceInfo>& audioInputDevices = m_mainWindow.m_dspEngine->getAudioDeviceInfo()->getInputDevices();
-    const QList<QAudioDeviceInfo>& audioOutputDevices = m_mainWindow.m_dspEngine->getAudioDeviceInfo()->getOutputDevices();
+    const QList<QAudioDeviceInfo>& audioInputDevices = m_mainWindow.m_dspEngine->getAudioDeviceManager()->getInputDevices();
+    const QList<QAudioDeviceInfo>& audioOutputDevices = m_mainWindow.m_dspEngine->getAudioDeviceManager()->getOutputDevices();
     int nbInputDevices = audioInputDevices.size();
     int nbOutputDevices = audioOutputDevices.size();
 
@@ -276,17 +276,17 @@ int WebAPIAdapterGUI::instanceAudioPatch(
     inputIndex = inputIndex < -1 ? -1 : inputIndex > nbInputDevices ? nbInputDevices-1 : inputIndex;
     outputIndex = outputIndex < -1 ? -1 : outputIndex > nbOutputDevices ? nbOutputDevices-1 : outputIndex;
 
-    m_mainWindow.m_dspEngine->getAudioDeviceInfo()->setInputVolume(inputVolume);
-    m_mainWindow.m_dspEngine->getAudioDeviceInfo()->setInputDeviceIndex(inputIndex);
-    m_mainWindow.m_dspEngine->getAudioDeviceInfo()->setOutputDeviceIndex(outputIndex);
+    m_mainWindow.m_dspEngine->getAudioDeviceManager()->setInputVolume(inputVolume);
+    m_mainWindow.m_dspEngine->getAudioDeviceManager()->setInputDeviceIndex(inputIndex);
+    m_mainWindow.m_dspEngine->getAudioDeviceManager()->setOutputDeviceIndex(outputIndex);
 
     m_mainWindow.m_dspEngine->setAudioInputVolume(inputVolume);
     m_mainWindow.m_dspEngine->setAudioInputDeviceIndex(inputIndex);
     m_mainWindow.m_dspEngine->setAudioOutputDeviceIndex(outputIndex);
 
-    response.setInputVolume(m_mainWindow.m_dspEngine->getAudioDeviceInfo()->getInputVolume());
-    response.setInputIndex(m_mainWindow.m_dspEngine->getAudioDeviceInfo()->getInputDeviceIndex());
-    response.setOutputIndex(m_mainWindow.m_dspEngine->getAudioDeviceInfo()->getOutputDeviceIndex());
+    response.setInputVolume(m_mainWindow.m_dspEngine->getAudioDeviceManager()->getInputVolume());
+    response.setInputIndex(m_mainWindow.m_dspEngine->getAudioDeviceManager()->getInputDeviceIndex());
+    response.setOutputIndex(m_mainWindow.m_dspEngine->getAudioDeviceManager()->getOutputDeviceIndex());
 
     return 200;
 }
diff --git a/sdrsrv/maincore.cpp b/sdrsrv/maincore.cpp
index 27a0146fe..340837cb8 100644
--- a/sdrsrv/maincore.cpp
+++ b/sdrsrv/maincore.cpp
@@ -59,7 +59,7 @@ MainCore::MainCore(qtwebapp::LoggerWithFile *logger, const MainParser& parser, Q
     qDebug() << "MainCore::MainCore: start";
 
     m_instance = this;
-    m_settings.setAudioDeviceInfo(m_dspEngine->getAudioDeviceInfo());
+    m_settings.setAudioDeviceManager(m_dspEngine->getAudioDeviceManager());
 
     m_pluginManager = new PluginManager(this);
     m_pluginManager->loadPlugins(QString("pluginssrv"));
diff --git a/sdrsrv/webapi/webapiadaptersrv.cpp b/sdrsrv/webapi/webapiadaptersrv.cpp
index 23d14dfef..607620614 100644
--- a/sdrsrv/webapi/webapiadaptersrv.cpp
+++ b/sdrsrv/webapi/webapiadaptersrv.cpp
@@ -228,17 +228,17 @@ int WebAPIAdapterSrv::instanceAudioGet(
         SWGSDRangel::SWGAudioDevices& response,
         SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
 {
-    const QList<QAudioDeviceInfo>& audioInputDevices = m_mainCore.m_dspEngine->getAudioDeviceInfo()->getInputDevices();
-    const QList<QAudioDeviceInfo>& audioOutputDevices = m_mainCore.m_dspEngine->getAudioDeviceInfo()->getOutputDevices();
+    const QList<QAudioDeviceInfo>& audioInputDevices = m_mainCore.m_dspEngine->getAudioDeviceManager()->getInputDevices();
+    const QList<QAudioDeviceInfo>& audioOutputDevices = m_mainCore.m_dspEngine->getAudioDeviceManager()->getOutputDevices();
     int nbInputDevices = audioInputDevices.size();
     int nbOutputDevices = audioOutputDevices.size();
 
     response.init();
     response.setNbInputDevices(nbInputDevices);
-    response.setInputDeviceSelectedIndex(m_mainCore.m_dspEngine->getAudioDeviceInfo()->getInputDeviceIndex());
+    response.setInputDeviceSelectedIndex(m_mainCore.m_dspEngine->getAudioDeviceManager()->getInputDeviceIndex());
     response.setNbOutputDevices(nbOutputDevices);
-    response.setOutputDeviceSelectedIndex(m_mainCore.m_dspEngine->getAudioDeviceInfo()->getOutputDeviceIndex());
-    response.setInputVolume(m_mainCore.m_dspEngine->getAudioDeviceInfo()->getInputVolume());
+    response.setOutputDeviceSelectedIndex(m_mainCore.m_dspEngine->getAudioDeviceManager()->getOutputDeviceIndex());
+    response.setInputVolume(m_mainCore.m_dspEngine->getAudioDeviceManager()->getInputVolume());
     QList<SWGSDRangel::SWGAudioDevice*> *inputDevices = response.getInputDevices();
     QList<SWGSDRangel::SWGAudioDevice*> *outputDevices = response.getOutputDevices();
 
@@ -268,8 +268,8 @@ int WebAPIAdapterSrv::instanceAudioPatch(
     int inputIndex = response.getInputIndex();
     int outputIndex = response.getOutputIndex();
 
-    const QList<QAudioDeviceInfo>& audioInputDevices = m_mainCore.m_dspEngine->getAudioDeviceInfo()->getInputDevices();
-    const QList<QAudioDeviceInfo>& audioOutputDevices = m_mainCore.m_dspEngine->getAudioDeviceInfo()->getOutputDevices();
+    const QList<QAudioDeviceInfo>& audioInputDevices = m_mainCore.m_dspEngine->getAudioDeviceManager()->getInputDevices();
+    const QList<QAudioDeviceInfo>& audioOutputDevices = m_mainCore.m_dspEngine->getAudioDeviceManager()->getOutputDevices();
     int nbInputDevices = audioInputDevices.size();
     int nbOutputDevices = audioOutputDevices.size();
 
@@ -277,17 +277,17 @@ int WebAPIAdapterSrv::instanceAudioPatch(
     inputIndex = inputIndex < -1 ? -1 : inputIndex > nbInputDevices ? nbInputDevices-1 : inputIndex;
     outputIndex = outputIndex < -1 ? -1 : outputIndex > nbOutputDevices ? nbOutputDevices-1 : outputIndex;
 
-    m_mainCore.m_dspEngine->getAudioDeviceInfo()->setInputVolume(inputVolume);
-    m_mainCore.m_dspEngine->getAudioDeviceInfo()->setInputDeviceIndex(inputIndex);
-    m_mainCore.m_dspEngine->getAudioDeviceInfo()->setOutputDeviceIndex(outputIndex);
+    m_mainCore.m_dspEngine->getAudioDeviceManager()->setInputVolume(inputVolume);
+    m_mainCore.m_dspEngine->getAudioDeviceManager()->setInputDeviceIndex(inputIndex);
+    m_mainCore.m_dspEngine->getAudioDeviceManager()->setOutputDeviceIndex(outputIndex);
 
     m_mainCore.m_dspEngine->setAudioInputVolume(inputVolume);
     m_mainCore.m_dspEngine->setAudioInputDeviceIndex(inputIndex);
     m_mainCore.m_dspEngine->setAudioOutputDeviceIndex(outputIndex);
 
-    response.setInputVolume(m_mainCore.m_dspEngine->getAudioDeviceInfo()->getInputVolume());
-    response.setInputIndex(m_mainCore.m_dspEngine->getAudioDeviceInfo()->getInputDeviceIndex());
-    response.setOutputIndex(m_mainCore.m_dspEngine->getAudioDeviceInfo()->getOutputDeviceIndex());
+    response.setInputVolume(m_mainCore.m_dspEngine->getAudioDeviceManager()->getInputVolume());
+    response.setInputIndex(m_mainCore.m_dspEngine->getAudioDeviceManager()->getInputDeviceIndex());
+    response.setOutputIndex(m_mainCore.m_dspEngine->getAudioDeviceManager()->getOutputDeviceIndex());
 
     return 200;
 }