From bf94f1f861e2b3764efaa7d3d3d3d72a310e2a43 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 25 Feb 2013 17:13:44 -0800 Subject: [PATCH] refactor Audio.cpp in interface to use parseData in ARB --- interface/src/Audio.cpp | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index 27c2a33a0b..6e9136b4b5 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -225,26 +225,7 @@ void *receiveAudioViaUDP(void *args) { } AudioRingBuffer *ringBuffer = sharedAudioData->ringBuffer; - - if (ringBuffer->getEndOfLastWrite() == NULL) { - ringBuffer->setEndOfLastWrite(ringBuffer->getBuffer()); - } else if (ringBuffer->diffLastWriteNextOutput() > RING_BUFFER_SAMPLES - PACKET_LENGTH_SAMPLES) { - - // reset us to started state - ringBuffer->setEndOfLastWrite(ringBuffer->getBuffer()); - ringBuffer->setNextOutput(ringBuffer->getBuffer()); - ringBuffer->setStarted(false); - } - - int16_t *copyToPointer = ringBuffer->getEndOfLastWrite(); - - // just copy the recieved data to the right spot and then add packet length to previous pointer - memcpy(copyToPointer, receivedData, PACKET_LENGTH_BYTES); - ringBuffer->setEndOfLastWrite(ringBuffer->getEndOfLastWrite() + PACKET_LENGTH_SAMPLES); - - if (ringBuffer->getEndOfLastWrite() == ringBuffer->getBuffer() + RING_BUFFER_SAMPLES) { - ringBuffer->setEndOfLastWrite(ringBuffer->getBuffer()); - } + ringBuffer->parseData(receivedData, PACKET_LENGTH_BYTES); if (LOG_SAMPLE_DELAY) { gettimeofday(&previousReceiveTime, NULL);