From d4dc06d2e7e12960a6c57fe81d792b2693282f9b Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Wed, 18 Sep 2019 12:44:03 -0700 Subject: [PATCH] fixed issue with null device on load. --- libraries/audio-client/src/AudioClient.cpp | 15 ++++++++++++++- libraries/audio-client/src/AudioClient.h | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index 4ebd21f349..48eaf9fa5d 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -481,6 +481,19 @@ void AudioClient::setAudioPaused(bool pause) { } } + +HifiAudioDeviceInfo AudioClient::getNamedAudioDevice(QAudio::Mode mode, const QString& deviceName) { + HifiAudioDeviceInfo result; + + foreach(HifiAudioDeviceInfo audioDevice, getAudioDevices(mode)) { + if (audioDevice.deviceName().trimmed() == deviceName.trimmed()) { + result = audioDevice; + break; + } + } + return result; +} + HifiAudioDeviceInfo getNamedAudioDeviceForMode(QAudio::Mode mode, const QString& deviceName) { HifiAudioDeviceInfo result; foreach (HifiAudioDeviceInfo audioDevice, getAvailableDevices(mode)) { @@ -1043,7 +1056,7 @@ bool AudioClient::switchAudioDevice(QAudio::Mode mode, const HifiAudioDeviceInfo } bool AudioClient::switchAudioDevice(QAudio::Mode mode, const QString& deviceName) { - return switchAudioDevice(mode, getNamedAudioDeviceForMode(mode, deviceName)); + return switchAudioDevice(mode, getNamedAudioDevice(mode, deviceName)); } void AudioClient::configureReverb() { diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h index bbc22ba93d..4faa9f1117 100644 --- a/libraries/audio-client/src/AudioClient.h +++ b/libraries/audio-client/src/AudioClient.h @@ -126,6 +126,8 @@ public: const MixedProcessedAudioStream& getReceivedAudioStream() const { return _receivedAudioStream; } MixedProcessedAudioStream& getReceivedAudioStream() { return _receivedAudioStream; } + + HifiAudioDeviceInfo getNamedAudioDevice(QAudio::Mode mode, const QString& deviceName); const QAudioFormat& getOutputFormat() const { return _outputFormat; }