mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 22:36:57 +02:00
fixed selection issue
This commit is contained in:
parent
a8602195d4
commit
0410a45da1
2 changed files with 17 additions and 6 deletions
|
@ -268,9 +268,14 @@ void AudioDeviceList::onDevicesChanged(const QList<HifiAudioDeviceInfo>& devices
|
||||||
for (bool isHMD : {false, true}) {
|
for (bool isHMD : {false, true}) {
|
||||||
auto& backupSelectedDeviceName = isHMD ? _backupSelectedHMDDeviceName : _backupSelectedDesktopDeviceName;
|
auto& backupSelectedDeviceName = isHMD ? _backupSelectedHMDDeviceName : _backupSelectedDesktopDeviceName;
|
||||||
if (deviceInfo.deviceName() == backupSelectedDeviceName) {
|
if (deviceInfo.deviceName() == backupSelectedDeviceName) {
|
||||||
HifiAudioDeviceInfo& selectedDevice = isHMD ? _selectedHMDDevice : _selectedDesktopDevice;
|
if (isHMD && deviceInfo.getDeviceType() != HifiAudioDeviceInfo::desktop) {
|
||||||
selectedDevice = deviceInfo;
|
_selectedHMDDevice= deviceInfo;
|
||||||
backupSelectedDeviceName.clear();
|
backupSelectedDeviceName.clear();
|
||||||
|
} else if (!isHMD && deviceInfo.getDeviceType() != HifiAudioDeviceInfo::hmd) {
|
||||||
|
_selectedDesktopDevice = deviceInfo;
|
||||||
|
backupSelectedDeviceName.clear();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -323,8 +328,14 @@ void AudioDeviceList::onDevicesChanged(const QList<HifiAudioDeviceInfo>& devices
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
//no selected device for context. fallback to saved
|
//no selected device for context. fallback to saved
|
||||||
const QString& savedDeviceName = isHMD ? _hmdSavedDeviceName : _desktopSavedDeviceName;
|
QString& savedDeviceName = isHMD ? _hmdSavedDeviceName : _desktopSavedDeviceName;
|
||||||
isSelected = (device.info.deviceName() == savedDeviceName);
|
|
||||||
|
if (device.info.deviceName() == savedDeviceName) {
|
||||||
|
if ((isHMD && device.info.getDeviceType() != HifiAudioDeviceInfo::desktop) ||
|
||||||
|
(!isHMD && device.info.getDeviceType() != HifiAudioDeviceInfo::hmd)) {
|
||||||
|
isSelected = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isSelected) {
|
if (isSelected) {
|
||||||
|
|
|
@ -570,7 +570,7 @@ HifiAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
|
||||||
HifiAudioDeviceInfo foundDevice;
|
HifiAudioDeviceInfo foundDevice;
|
||||||
foreach(QAudioDeviceInfo audioDevice, devices) {
|
foreach(QAudioDeviceInfo audioDevice, devices) {
|
||||||
if (audioDevice.deviceName().trimmed() == deviceName.trimmed()) {
|
if (audioDevice.deviceName().trimmed() == deviceName.trimmed()) {
|
||||||
foundDevice=HifiAudioDeviceInfo(audioDevice, true, mode, HifiAudioDeviceInfo::desktop);
|
foundDevice = HifiAudioDeviceInfo(audioDevice, true, mode, HifiAudioDeviceInfo::desktop);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue