Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 23:36:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16156 from sethalves/wtf-audio-devices

Browse source 
BUGZ-1434: use existing audio settings on startup
This commit is contained in:
Shannon Romano 2019-09-09 10:09:34 -07:00 committed by GitHub
commit 4017a4f937
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
interface/src/scripting/AudioDevices.cpp
View file

@ -71,32 +71,44 @@ static QString getTargetDevice(bool hmd, QAudio::Mode mode) {
Qt::ItemFlags AudioDeviceList::_flags { Qt::ItemIsSelectable | Qt::ItemIsEnabled }; 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 (mode == QAudio::AudioInput) {
if (setting1.isSet()) { auto& setting1 = getSetting(true, QAudio::AudioInput);
qDebug() << "Device name in settings for HMD, Input" << setting1.get(); if (setting1.isSet()) {
} else { qDebug() << "Device name in settings for HMD, Input" << setting1.get();
qDebug() << "Device name in settings for HMD, Input not set"; _backupSelectedHMDDeviceName = setting1.get();
} else {
qDebug() << "Device name in settings for HMD, Input not set";
}
} }
auto& setting2 = getSetting(true, QAudio::AudioOutput); if (mode == QAudio::AudioOutput) {
if (setting2.isSet()) { auto& setting2 = getSetting(true, QAudio::AudioOutput);
qDebug() << "Device name in settings for HMD, Output" << setting2.get(); if (setting2.isSet()) {
} else { qDebug() << "Device name in settings for HMD, Output" << setting2.get();
qDebug() << "Device name in settings for HMD, Output not set"; _backupSelectedHMDDeviceName = setting2.get();
} else {
qDebug() << "Device name in settings for HMD, Output not set";
}
} }
auto& setting3 = getSetting(false, QAudio::AudioInput); if (mode == QAudio::AudioInput) {
if (setting3.isSet()) { auto& setting3 = getSetting(false, QAudio::AudioInput);
qDebug() << "Device name in settings for Desktop, Input" << setting3.get(); if (setting3.isSet()) {
} else { qDebug() << "Device name in settings for Desktop, Input" << setting3.get();
qDebug() << "Device name in settings for Desktop, Input not set"; _backupSelectedDesktopDeviceName = setting3.get();
} else {
qDebug() << "Device name in settings for Desktop, Input not set";
}
} }
auto& setting4 = getSetting(false, QAudio::AudioOutput); if (mode == QAudio::AudioOutput) {
if (setting4.isSet()) { auto& setting4 = getSetting(false, QAudio::AudioOutput);
qDebug() << "Device name in settings for Desktop, Output" << setting4.get(); if (setting4.isSet()) {
} else { qDebug() << "Device name in settings for Desktop, Output" << setting4.get();
qDebug() << "Device name in settings for Desktop, Output not set"; _backupSelectedDesktopDeviceName = setting4.get();
} else {
qDebug() << "Device name in settings for Desktop, Output not set";
}
} }
} }