From 37ba50992cd7c6f7d770489088c9d3e183160be5 Mon Sep 17 00:00:00 2001 From: amerhifi Date: Tue, 29 Oct 2019 07:16:58 -0700 Subject: [PATCH 1/2] temp reverting the call to display plugin --- libraries/audio-client/src/AudioClient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index fe4fab8415..7534f8166d 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -101,7 +101,7 @@ static QString getHmdAudioDeviceName(QAudio::Mode mode) { QList getAvailableDevices(QAudio::Mode mode) { //get hmd device name prior to locking device mutex. in case of shutdown, this thread will be locked and audio client //cannot properly shut down. - QString hmdDeviceName = getHmdAudioDeviceName(mode); + QString hmdDeviceName = QString(); //getHmdAudioDeviceName(mode); QString defDeviceName = defaultAudioDeviceName(mode); // NOTE: availableDevices() clobbers the Qt internal device list From 57302dd2233a045b99185e3f412c5bcd7fbfd8b4 Mon Sep 17 00:00:00 2001 From: amerhifi Date: Tue, 29 Oct 2019 08:34:35 -0700 Subject: [PATCH 2/2] fixing build warning on mac/linux --- libraries/audio-client/src/AudioClient.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index 7534f8166d..9f28a61ed8 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -83,25 +83,11 @@ Mutex _recordMutex; QString defaultAudioDeviceName(QAudio::Mode mode); -static QString getHmdAudioDeviceName(QAudio::Mode mode) { - foreach(DisplayPluginPointer displayPlugin, PluginManager::getInstance()->getAllDisplayPlugins()) { - if (displayPlugin && displayPlugin->isHmd()) { - if (mode == QAudio::AudioInput) { - return displayPlugin->getPreferredAudioInDevice(); - } else { - return displayPlugin->getPreferredAudioOutDevice(); - } - break; - } - } - return QString(); -} - // thread-safe QList getAvailableDevices(QAudio::Mode mode) { //get hmd device name prior to locking device mutex. in case of shutdown, this thread will be locked and audio client //cannot properly shut down. - QString hmdDeviceName = QString(); //getHmdAudioDeviceName(mode); + QString hmdDeviceName = QString(); QString defDeviceName = defaultAudioDeviceName(mode); // NOTE: availableDevices() clobbers the Qt internal device list