From a92571bdeea3dafba76adb65cca10c60526d97f1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 9 May 2013 11:45:59 -0700 Subject: [PATCH] initialize the _shouldLoopbackForAgent variable --- libraries/shared/src/AudioRingBuffer.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libraries/shared/src/AudioRingBuffer.cpp b/libraries/shared/src/AudioRingBuffer.cpp index 5079582544..a399852950 100644 --- a/libraries/shared/src/AudioRingBuffer.cpp +++ b/libraries/shared/src/AudioRingBuffer.cpp @@ -9,15 +9,13 @@ #include #include "AudioRingBuffer.h" -AudioRingBuffer::AudioRingBuffer(int ringSamples, int bufferSamples) { - ringBufferLengthSamples = ringSamples; - bufferLengthSamples = bufferSamples; - - started = false; - _shouldBeAddedToMix = false; - - endOfLastWrite = NULL; - +AudioRingBuffer::AudioRingBuffer(int ringSamples, int bufferSamples) : + ringBufferLengthSamples(ringSamples), + bufferLengthSamples(bufferSamples), + endOfLastWrite(NULL), + started(false), + _shouldBeAddedToMix(false), + _shouldLoopbackForAgent(false) { buffer = new int16_t[ringBufferLengthSamples]; nextOutput = buffer; }; @@ -27,6 +25,7 @@ AudioRingBuffer::AudioRingBuffer(const AudioRingBuffer &otherRingBuffer) { bufferLengthSamples = otherRingBuffer.bufferLengthSamples; started = otherRingBuffer.started; _shouldBeAddedToMix = otherRingBuffer._shouldBeAddedToMix; + _shouldLoopbackForAgent = otherRingBuffer._shouldLoopbackForAgent; buffer = new int16_t[ringBufferLengthSamples]; memcpy(buffer, otherRingBuffer.buffer, sizeof(int16_t) * ringBufferLengthSamples); @@ -149,8 +148,7 @@ int AudioRingBuffer::parseData(unsigned char* sourceBuffer, int numBytes) { return numBytes; } -short AudioRingBuffer::diffLastWriteNextOutput() -{ +short AudioRingBuffer::diffLastWriteNextOutput() { if (endOfLastWrite == NULL) { return 0; } else {