From 4355ca83285dbb3375e89e378342d205f53e3cd9 Mon Sep 17 00:00:00 2001 From: wangyix Date: Mon, 4 Aug 2014 17:24:18 -0700 Subject: [PATCH] minor member rename --- interface/src/Audio.cpp | 4 ++-- interface/src/Audio.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index 82b8fe3941..1711055270 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -754,12 +754,12 @@ void Audio::processReceivedAudioStreamSamples(const QByteArray& inputBuffer, QBy // copy the samples we'll resample from the spatial audio ring buffer - this also // pushes the read pointer of the spatial audio ring buffer forwards - _spatialAudioRingBuffer.readSamples(_spatialProcessingBuffer, numNetworkOutputSamples); + _spatialAudioRingBuffer.readSamples(_outputProcessingBuffer, numNetworkOutputSamples); // Advance the start point for the next packet of audio to arrive _spatialAudioStart += numNetworkOutputSamples / _desiredOutputFormat.channelCount(); - receivedSamples = _spatialProcessingBuffer; + receivedSamples = _outputProcessingBuffer; } else { // copy the samples we'll resample from the ring buffer - this also // pushes the read pointer of the ring buffer forwards diff --git a/interface/src/Audio.h b/interface/src/Audio.h index 3ff0412788..ab16a77632 100644 --- a/interface/src/Audio.h +++ b/interface/src/Audio.h @@ -167,7 +167,7 @@ private: QAudioFormat _desiredOutputFormat; QAudioFormat _outputFormat; int _outputFrameSize; - int16_t _spatialProcessingBuffer[NETWORK_BUFFER_LENGTH_SAMPLES_STEREO]; + int16_t _outputProcessingBuffer[NETWORK_BUFFER_LENGTH_SAMPLES_STEREO]; int _numOutputCallbackBytes; QAudioOutput* _loopbackAudioOutput; QIODevice* _loopbackOutputDevice;