From d2ed3caf02e47f344e38d6d25e2d4a313154e2e3 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Wed, 7 Dec 2016 13:40:22 -0500 Subject: [PATCH] respect audio thread pool size setting --- assignment-client/src/audio/AudioMixer.cpp | 7 +++++-- assignment-client/src/audio/AudioMixerSlavePool.cpp | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index 9608f7c63b..01715497b1 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -512,9 +512,12 @@ void AudioMixer::parseSettingsObject(const QJsonObject &settingsObject) { const QString AUTO_THREADS = "auto_threads"; bool autoThreads = audioThreadingGroupObject[AUTO_THREADS].toBool(); if (!autoThreads) { + bool ok; const QString NUM_THREADS = "num_threads"; - int numThreads = audioThreadingGroupObject[NUM_THREADS].toInt(); - _slavePool.setNumThreads(numThreads); + int numThreads = audioThreadingGroupObject[NUM_THREADS].toString().toInt(&ok); + if (ok) { + _slavePool.setNumThreads(numThreads); + } } } diff --git a/assignment-client/src/audio/AudioMixerSlavePool.cpp b/assignment-client/src/audio/AudioMixerSlavePool.cpp index 6d17028de3..6403ebc4d8 100644 --- a/assignment-client/src/audio/AudioMixerSlavePool.cpp +++ b/assignment-client/src/audio/AudioMixerSlavePool.cpp @@ -113,7 +113,7 @@ void AudioMixerSlavePool::setNumThreads(int numThreads) { int clampedThreads = std::min(std::max(1, numThreads), maxThreads); if (clampedThreads != numThreads) { - qWarning("%s: clamped to %d (was %d)", __FUNCTION__, numThreads, clampedThreads); + qWarning("%s: clamped to %d (was %d)", __FUNCTION__, clampedThreads, numThreads); numThreads = clampedThreads; } }