From 397e6c8b137e7edd102014428d1172e31f71e26f Mon Sep 17 00:00:00 2001 From: wangyix Date: Wed, 16 Jul 2014 17:34:48 -0700 Subject: [PATCH] renamed a function --- assignment-client/src/audio/AudioMixerClientData.cpp | 2 +- libraries/audio/src/PositionalAudioRingBuffer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index 635acf8eb2..107004d3e3 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -227,7 +227,7 @@ AudioStreamStats AudioMixerClientData::getAudioStreamStatsOfStream(const Positio streamStats._timeGapWindowAverage = timeGapStats.getWindowAverage(); streamStats._ringBufferFramesAvailable = ringBuffer->framesAvailable(); - streamStats._ringBufferFramesAvailableAverage = ringBuffer->getAverageFramesAvailable(); + streamStats._ringBufferFramesAvailableAverage = ringBuffer->getFramesAvailableAverage(); streamStats._ringBufferDesiredJitterBufferFrames = ringBuffer->getDesiredJitterBufferFrames(); streamStats._ringBufferStarveCount = ringBuffer->getStarveCount(); streamStats._ringBufferConsecutiveNotMixedCount = ringBuffer->getConsecutiveNotMixedCount(); diff --git a/libraries/audio/src/PositionalAudioRingBuffer.h b/libraries/audio/src/PositionalAudioRingBuffer.h index bff68e3e0f..c4645c362c 100644 --- a/libraries/audio/src/PositionalAudioRingBuffer.h +++ b/libraries/audio/src/PositionalAudioRingBuffer.h @@ -75,7 +75,7 @@ public: int getCalculatedDesiredJitterBufferFrames() const; /// returns what we would calculate our desired as if asked int getDesiredJitterBufferFrames() const { return _desiredJitterBufferFrames; } - double getAverageFramesAvailable() const { return _framesAvailableStats.getWindowAverage(); } + double getFramesAvailableAverage() const { return _framesAvailableStats.getWindowAverage(); } int getConsecutiveNotMixedCount() const { return _consecutiveNotMixedCount; } int getStarveCount() const { return _starveCount; }