From c5b0288c12030c81200d3076cac5de6b757fdbaf Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 21 Mar 2014 18:49:46 -0700 Subject: [PATCH] remove numClientsMixedInFrame since it is no longer used --- assignment-client/src/audio/AudioMixer.cpp | 7 +------ assignment-client/src/audio/AudioMixer.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index ba17847773..f3b623bac2 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -66,8 +66,7 @@ void attachNewBufferToNode(Node *newNode) { AudioMixer::AudioMixer(const QByteArray& packet) : ThreadedAssignment(packet), _trailingSleepRatio(1.0f), - _minAudibilityThreshold(LOUDNESS_TO_DISTANCE_RATIO / 2.0f), - _numClientsMixedInFrame(0) + _minAudibilityThreshold(LOUDNESS_TO_DISTANCE_RATIO / 2.0f) { } @@ -95,8 +94,6 @@ void AudioMixer::addBufferToMixForListeningNodeWithBuffer(PositionalAudioRingBuf return; } - ++_numClientsMixedInFrame; - glm::quat inverseOrientation = glm::inverse(listeningNodeBuffer->getOrientation()); float distanceSquareToSource = glm::dot(relativePosition, relativePosition); @@ -448,8 +445,6 @@ void AudioMixer::run() { nodeList->writeDatagram(clientMixBuffer, NETWORK_BUFFER_LENGTH_BYTES_STEREO + numBytesPacketHeader, node); } } - - _numClientsMixedInFrame = 0; // push forward the next output pointers for any audio buffers we used foreach (const SharedNodePointer& node, nodeList->getNodeHash()) { diff --git a/assignment-client/src/audio/AudioMixer.h b/assignment-client/src/audio/AudioMixer.h index d8f1a8eb85..9d731a5c9c 100644 --- a/assignment-client/src/audio/AudioMixer.h +++ b/assignment-client/src/audio/AudioMixer.h @@ -42,7 +42,6 @@ private: float _trailingSleepRatio; float _minAudibilityThreshold; - int _numClientsMixedInFrame; }; #endif /* defined(__hifi__AudioMixer__) */