From ba96ab25dce8ffe307033964f46e326d8e893213 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Wed, 31 Aug 2016 14:43:44 -0700 Subject: [PATCH] inline some AudioRingBuffer definitions --- libraries/audio/src/AudioRingBuffer.cpp | 12 ------------ libraries/audio/src/AudioRingBuffer.h | 6 +++--- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/libraries/audio/src/AudioRingBuffer.cpp b/libraries/audio/src/AudioRingBuffer.cpp index 7ded6f8106..b088e94871 100644 --- a/libraries/audio/src/AudioRingBuffer.cpp +++ b/libraries/audio/src/AudioRingBuffer.cpp @@ -137,18 +137,6 @@ int AudioRingBuffer::writeData(const char* data, int maxSize) { return numWriteSamples * sizeof(int16_t); } -inline int16_t& AudioRingBuffer::operator[](const int index) { - return *shiftedPositionAccomodatingWrap(_nextOutput, index); -} - -inline const int16_t& AudioRingBuffer::operator[] (const int index) const { - return *shiftedPositionAccomodatingWrap(_nextOutput, index); -} - -inline void AudioRingBuffer::shiftReadPosition(unsigned int numSamples) { - _nextOutput = shiftedPositionAccomodatingWrap(_nextOutput, numSamples); -} - int AudioRingBuffer::samplesAvailable() const { if (!_endOfLastWrite) { return 0; diff --git a/libraries/audio/src/AudioRingBuffer.h b/libraries/audio/src/AudioRingBuffer.h index 00d80c7f32..7ccb32ce10 100644 --- a/libraries/audio/src/AudioRingBuffer.h +++ b/libraries/audio/src/AudioRingBuffer.h @@ -63,13 +63,13 @@ public: int writeData(const char* source, int maxSize); /// Returns a reference to the index-th sample offset from the current read sample - int16_t& operator[](const int index); - const int16_t& operator[] (const int index) const; + int16_t& operator[](const int index) { return *shiftedPositionAccomodatingWrap(_nextOutput, index); } + const int16_t& operator[] (const int index) const { return *shiftedPositionAccomodatingWrap(_nextOutput, index); } /// Essentially discards the next numSamples from the ring buffer /// NOTE: This is not checked - it is possible to shift past written data /// Use samplesAvailable() to see the distance a valid shift can go - void shiftReadPosition(unsigned int numSamples); + void shiftReadPosition(unsigned int numSamples) { _nextOutput = shiftedPositionAccomodatingWrap(_nextOutput, numSamples); } int samplesAvailable() const; int framesAvailable() const { return (_numFrameSamples == 0) ? 0 : samplesAvailable() / _numFrameSamples; }