From e455d153ee199019b8afe451d471671beb0eef01 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 12 Oct 2019 16:46:34 +0200 Subject: [PATCH] [AFV] Ref T730, make sure device is "valid" --- src/blackmisc/audio/audiodeviceinfo.h | 2 +- src/blacksound/audioutilities.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blackmisc/audio/audiodeviceinfo.h b/src/blackmisc/audio/audiodeviceinfo.h index 2e19abcf0..dda18be38 100644 --- a/src/blackmisc/audio/audiodeviceinfo.h +++ b/src/blackmisc/audio/audiodeviceinfo.h @@ -62,7 +62,7 @@ namespace BlackMisc bool isOutputDevice() const { return this->getType() == OutputDevice; } //! Valid audio device object? - bool isValid() const { return !m_deviceName.isEmpty(); } + bool isValid() const { return !m_deviceName.isEmpty() && (m_deviceName != Unknown); } //! Is this a default device? bool isDefault() const { return m_deviceName == "default"; } diff --git a/src/blacksound/audioutilities.cpp b/src/blacksound/audioutilities.cpp index f25cfe048..ec42a575f 100644 --- a/src/blacksound/audioutilities.cpp +++ b/src/blacksound/audioutilities.cpp @@ -82,13 +82,13 @@ namespace BlackSound QAudioDeviceInfo getLowestLatencyDevice(const CAudioDeviceInfo &device, QAudioFormat &format) { - if (device.isDefault()) + if (device.isDefault() || !device.isValid()) { if (device.getType() == CAudioDeviceInfo::InputDevice) { return QAudioDeviceInfo::defaultInputDevice(); } else { return QAudioDeviceInfo::defaultOutputDevice(); } } - QAudio::Mode mode = (device.getType() == CAudioDeviceInfo::InputDevice) ? QAudio::AudioInput : QAudio::AudioOutput; + const QAudio::Mode mode = device.isInputDevice() ? QAudio::AudioInput : QAudio::AudioOutput; const QList allQtDevices = QAudioDeviceInfo::availableDevices(mode); // Find the one with lowest latency.