From a8157ae2cdaaa5e5dda1e69a75741032379543ae Mon Sep 17 00:00:00 2001 From: David Kelly Date: Tue, 13 Dec 2016 17:48:30 -0800 Subject: [PATCH] Typo, plus some CR feedback --- libraries/audio-client/src/AudioClient.cpp | 3 ++- libraries/audio/src/AudioInjectorLocalBuffer.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index 0d5436f787..aba407f38e 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -1131,8 +1131,9 @@ void AudioClient::mixLocalAudioInjectors(float* mixBuffer) { } else if (injector->isStereo()) { // stereo gets directly mixed into mixBuffer + float gain = injector->getVolume(); for (int i = 0; i < AudioConstants::NETWORK_FRAME_SAMPLES_STEREO; i++) { - mixBuffer[i] += (float)_scratchBuffer[i] * (1/32768.0f) * injector->getVolume(); + mixBuffer[i] += (float)_scratchBuffer[i] * (1/32768.0f) * gain; } } else { diff --git a/libraries/audio/src/AudioInjectorLocalBuffer.cpp b/libraries/audio/src/AudioInjectorLocalBuffer.cpp index a9fb4d9f78..049adb0cc6 100644 --- a/libraries/audio/src/AudioInjectorLocalBuffer.cpp +++ b/libraries/audio/src/AudioInjectorLocalBuffer.cpp @@ -16,7 +16,7 @@ AudioInjectorLocalBuffer::AudioInjectorLocalBuffer(const QByteArray& rawAudioArr _rawAudioArray(rawAudioArray), _shouldLoop(false), _isStopped(false), - _currentOffset(0), + _currentOffset(0) { }