From 78aa5820d06b9fbe6e4a20bdd9fc5ff08bea9e6d Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Sun, 27 Aug 2017 11:56:28 +0200
Subject: [PATCH] Added proper destructor call for audio scripting interface.
 Save settings in destructor. Added logging to check readed audio settings

---
 interface/src/Application.cpp            |  1 +
 interface/src/scripting/AudioDevices.cpp | 50 +++++++++++++++++++++++-
 interface/src/scripting/AudioDevices.h   |  3 ++
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index d13b7880fa..3aa3fbf95d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2052,6 +2052,7 @@ void Application::cleanupBeforeQuit() {
     // this must happen after QML, as there are unexplained audio crashes originating in qtwebengine
     DependencyManager::destroy<AudioClient>();
     DependencyManager::destroy<AudioInjectorManager>();
+    DependencyManager::destroy<AudioScriptingInterface>();
 
     qCDebug(interfaceapp) << "Application::cleanupBeforeQuit() complete";
 }
diff --git a/interface/src/scripting/AudioDevices.cpp b/interface/src/scripting/AudioDevices.cpp
index e31641389c..cff17c1a5c 100644
--- a/interface/src/scripting/AudioDevices.cpp
+++ b/interface/src/scripting/AudioDevices.cpp
@@ -61,7 +61,52 @@ QHash<int, QByteArray> AudioDeviceList::_roles {
 
 Qt::ItemFlags AudioDeviceList::_flags { Qt::ItemIsSelectable | Qt::ItemIsEnabled };
 
-AudioDeviceList::AudioDeviceList(QAudio::Mode mode) : _mode(mode) {}
+AudioDeviceList::AudioDeviceList(QAudio::Mode mode) : _mode(mode) {
+    auto& setting1 = getSetting(true, QAudio::AudioInput);
+    if (setting1.isSet()) {
+        qDebug() << "Device name in settings for HMD, Input" << setting1.get();
+    } else {
+        qDebug() << "Device name in settings for HMD, Input not set";
+    }
+
+    auto& setting2 = getSetting(true, QAudio::AudioOutput);
+    if (setting2.isSet()) {
+        qDebug() << "Device name in settings for HMD, Output" << setting2.get();
+    } else {
+        qDebug() << "Device name in settings for HMD, Output not set";
+    }
+
+    auto& setting3 = getSetting(false, QAudio::AudioInput);
+    if (setting3.isSet()) {
+        qDebug() << "Device name in settings for Desktop, Input" << setting3.get();
+    } else {
+        qDebug() << "Device name in settings for Desktop, Input not set";
+    }
+
+    auto& setting4 = getSetting(false, QAudio::AudioOutput);
+    if (setting4.isSet()) {
+        qDebug() << "Device name in settings for Desktop, Output" << setting4.get();
+    } else {
+        qDebug() << "Device name in settings for Desktop, Output not set";
+    }
+}
+
+AudioDeviceList::~AudioDeviceList() {
+    //save all selected devices
+    auto& settingHMD = getSetting(true, _mode);
+    auto& settingDesktop = getSetting(false, _mode);
+    // store the selected device
+    foreach(AudioDevice adevice, _devices) {
+        if (adevice.selectedDesktop) {
+            qDebug() << "Saving Desktop for" << _mode << "name" << adevice.info.deviceName();
+            settingDesktop.set(adevice.info.deviceName());
+        }
+        if (adevice.selectedHMD) {
+            qDebug() << "Saving HMD for" << _mode << "name" << adevice.info.deviceName();
+            settingHMD.set(adevice.info.deviceName());
+        }
+    }
+}
 
 QVariant AudioDeviceList::data(const QModelIndex& index, int role) const {
     if (!index.isValid() || index.row() >= _devices.size()) {
@@ -156,6 +201,7 @@ void AudioDeviceList::onDevicesChanged(const QList<QAudioDeviceInfo>& devices, b
             //no selected device for context. fallback to saved
             isSelected = (device.info.deviceName() == savedDeviceName);
         }
+        qDebug() << "adding audio device:" << device.display << device.selectedDesktop << device.selectedHMD << _mode;
         _devices.push_back(device);
     }
 
@@ -182,6 +228,8 @@ AudioDevices::AudioDevices(bool& contextIsHMD) : _contextIsHMD(contextIsHMD) {
     _outputs.onDevicesChanged(devicesOutput, false);
 }
 
+AudioDevices::~AudioDevices() {}
+
 void AudioDevices::onContextChanged(const QString& context) {
     _inputs.resetDevice(_contextIsHMD);
     _outputs.resetDevice(_contextIsHMD);
diff --git a/interface/src/scripting/AudioDevices.h b/interface/src/scripting/AudioDevices.h
index 5399123329..9b3b2bce9b 100644
--- a/interface/src/scripting/AudioDevices.h
+++ b/interface/src/scripting/AudioDevices.h
@@ -38,6 +38,7 @@ class AudioDeviceList : public QAbstractListModel {
 
 public:
     AudioDeviceList(QAudio::Mode mode);
+    virtual ~AudioDeviceList();
 
     int rowCount(const QModelIndex& parent = QModelIndex()) const override { Q_UNUSED(parent); return _devices.size(); }
     QHash<int, QByteArray> roleNames() const override { return _roles; }
@@ -78,6 +79,8 @@ class AudioDevices : public QObject {
 
 public:
     AudioDevices(bool& contextIsHMD);
+    virtual ~AudioDevices();
+
     void chooseInputDevice(const QAudioDeviceInfo& device, bool isHMD);
     void chooseOutputDevice(const QAudioDeviceInfo& device, bool isHMD);