Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-24 00:13:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #259 from birarda/mixer-crash

Browse source 
fix the audio-mixer crash for uninitialized _shouldLoopbackForAgent variable
This commit is contained in:
ZappoMan 2013-05-09 11:49:42 -07:00
commit 8ef78fde83
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libraries/shared/src/AudioRingBuffer.cpp
View file

@ -9,15 +9,13 @@
#include <cstring>
#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 {