From 065df442f356fd1eebcf5edf033790260a0b72a0 Mon Sep 17 00:00:00 2001 From: amerhifi Date: Tue, 17 Sep 2019 08:01:05 -0700 Subject: [PATCH] changing work location --- libraries/audio-client/src/AudioClient.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index a926865025..1b5633d5d8 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -120,7 +120,7 @@ void AudioClient::checkDevices() { auto outputDevices = getAvailableDevices(QAudio::AudioOutput); { - Lock lock(_deviceMutex); + //is the current device the default selected device? if (_inputDeviceInfo.isDefault() && _inputDeviceInfo == _defaultInputDevice) { auto defInput = defaultAudioDeviceForMode(QAudio::AudioInput); @@ -130,7 +130,7 @@ void AudioClient::checkDevices() { qDebug() << "Changing Current Default device " << _defaultInputDevice.getAudioDeviceName(); _defaultInputDevice.setDevice(defInput.getDevice()); qDebug() << "NEW Default device " << _defaultInputDevice.getAudioDeviceName(); - QMetaObject::invokeMethod(this, "switchInputToAudioDevice", Qt::QueuedConnection, Q_ARG(HifiAudioDeviceInfo, _defaultInputDevice)); + QMetaObject::invokeMethod(this, "switchAudioDevice", Q_ARG(QAudio::Mode, QAudio::AudioInput), Q_ARG(const HifiAudioDeviceInfo&, _defaultInputDevice)); } } @@ -138,8 +138,10 @@ void AudioClient::checkDevices() { auto defOutput = defaultAudioDeviceForMode(QAudio::AudioOutput); if (_defaultOutputDevice.getDevice() != defOutput.getDevice()) { + qDebug() << "Changing Current Default device " << _defaultOutputDevice.getAudioDeviceName(); _defaultOutputDevice.setDevice(defOutput.getDevice()); - QMetaObject::invokeMethod(this, "switchOutputToAudioDevice", Qt::QueuedConnection, Q_ARG(HifiAudioDeviceInfo, _defaultOutputDevice)); + qDebug() << "NEW Default device " << _defaultOutputDevice.getAudioDeviceName(); + QMetaObject::invokeMethod(this, "switchAudioDevice", Q_ARG(QAudio::Mode, QAudio::AudioOutput), Q_ARG(const HifiAudioDeviceInfo&, _defaultOutputDevice)); } } }