From 4eb88fb396807115842c6379a834bb7e908a991f Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sat, 7 Sep 2019 15:55:31 -0700 Subject: [PATCH] use existing audio settings on startup --- interface/src/scripting/AudioDevices.cpp | 52 +++++++++++++++--------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/interface/src/scripting/AudioDevices.cpp b/interface/src/scripting/AudioDevices.cpp index ce82786c8d..02072d3ff0 100644 --- a/interface/src/scripting/AudioDevices.cpp +++ b/interface/src/scripting/AudioDevices.cpp @@ -71,32 +71,44 @@ static QString getTargetDevice(bool hmd, QAudio::Mode mode) { Qt::ItemFlags AudioDeviceList::_flags { Qt::ItemIsSelectable | Qt::ItemIsEnabled }; 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"; + if (mode == QAudio::AudioInput) { + auto& setting1 = getSetting(true, QAudio::AudioInput); + if (setting1.isSet()) { + qDebug() << "Device name in settings for HMD, Input" << setting1.get(); + _backupSelectedHMDDeviceName = 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"; + if (mode == QAudio::AudioOutput) { + auto& setting2 = getSetting(true, QAudio::AudioOutput); + if (setting2.isSet()) { + qDebug() << "Device name in settings for HMD, Output" << setting2.get(); + _backupSelectedHMDDeviceName = 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"; + if (mode == QAudio::AudioInput) { + auto& setting3 = getSetting(false, QAudio::AudioInput); + if (setting3.isSet()) { + qDebug() << "Device name in settings for Desktop, Input" << setting3.get(); + _backupSelectedDesktopDeviceName = 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"; + if (mode == QAudio::AudioOutput) { + auto& setting4 = getSetting(false, QAudio::AudioOutput); + if (setting4.isSet()) { + qDebug() << "Device name in settings for Desktop, Output" << setting4.get(); + _backupSelectedDesktopDeviceName = setting4.get(); + } else { + qDebug() << "Device name in settings for Desktop, Output not set"; + } } }