Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 06:26:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2

Merge pull request from sethalves/dont-let-checkdevices-swap-pool

Browse source 
don't let checkDevices swamp thread pool
This commit is contained in:
Ken Cooke 2018-11-02 14:25:39 -07:00 committed by GitHub
commit 77988e400e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions

15
libraries/audio-client/src/AudioClient.cpp
View file

@ -244,13 +244,20 @@ AudioClient::AudioClient() :
// initialize wasapi; if getAvailableDevices is called from the CheckDevicesThread before this, it will crash
getAvailableDevices(QAudio::AudioInput);
getAvailableDevices(QAudio::AudioOutput);
// start a thread to detect any device changes
_checkDevicesTimer = new QTimer(this);
connect(_checkDevicesTimer, &QTimer::timeout, this, [this] {
QtConcurrent::run(QThreadPool::globalInstance(), [this] { checkDevices(); });
});
const unsigned long DEVICE_CHECK_INTERVAL_MSECS = 2 * 1000;
connect(_checkDevicesTimer, &QTimer::timeout, this, [=] {
QtConcurrent::run(QThreadPool::globalInstance(), [=] {
checkDevices();
// On some systems (Ubuntu) checking all the audio devices can take more than 2 seconds. To
// avoid consuming all of the thread pool, don't start the check interval until the previous
// check has completed.
QMetaObject::invokeMethod(_checkDevicesTimer, "start", Q_ARG(int, DEVICE_CHECK_INTERVAL_MSECS));
});
});
_checkDevicesTimer->setSingleShot(true);
_checkDevicesTimer->start(DEVICE_CHECK_INTERVAL_MSECS);
// start a thread to detect peak value changes