From c33592be067582445ae644c23d85260f0d8df632 Mon Sep 17 00:00:00 2001 From: Diadlo Date: Tue, 16 Jan 2018 02:01:08 +0300 Subject: [PATCH] style: Fix style --- src/audio/backend/openal.cpp | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/audio/backend/openal.cpp b/src/audio/backend/openal.cpp index 4c5bb1581..1151ac62d 100644 --- a/src/audio/backend/openal.cpp +++ b/src/audio/backend/openal.cpp @@ -466,10 +466,11 @@ void OpenAL::cleanupInput() qDebug() << "Closing audio input"; alcCaptureStop(alInDev); - if (alcCaptureCloseDevice(alInDev) == ALC_TRUE) + if (alcCaptureCloseDevice(alInDev) == ALC_TRUE) { alInDev = nullptr; - else + } else { qWarning() << "Failed to close input"; + } delete[] inputBuffer; } @@ -538,14 +539,10 @@ float OpenAL::getVolume() quint32 samples = AUDIO_FRAME_SAMPLE_COUNT * channels; float sum = 0.0; for (quint32 i = 0; i < samples; i++) { - float sample = (float)buf[i] / (float)std::numeric_limits::max(); - if (sample > 0) { - sum += sample; - } else { - sum -= sample; - } + float sample = static_cast(inputBuffer[i]) / std::numeric_limits::max(); + sum += qAbs(sample); } - return sum/samples; + return sum / samples; } /** @@ -563,26 +560,26 @@ void OpenAL::doAudio() { QMutexLocker lock(&audioLock); - if (!alInDev || !inSubscriptions) + if (!alInDev || !inSubscriptions) { return; + } ALint curSamples = 0; alcGetIntegerv(alInDev, ALC_CAPTURE_SAMPLES, sizeof(curSamples), &curSamples); - if (static_cast(curSamples) < AUDIO_FRAME_SAMPLE_COUNT) + if (static_cast(curSamples) < AUDIO_FRAME_SAMPLE_COUNT) { return; + } alcCaptureSamples(alInDev, inputBuffer, AUDIO_FRAME_SAMPLE_COUNT); float volume = getVolume(); - if (volume >= inputThreshold) - { + if (volume >= inputThreshold) { isActive = true; emit startActive(voiceHold); } emit Audio::volumeAvailable(volume); - if (!isActive) - { + if (!isActive) { return; }