From ffd2f614204bf5dd540952f6902576ea5edf6ce5 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 29 Mar 2013 08:20:37 -0700 Subject: [PATCH] don't use distance attenuation in audio mixer for now --- mixer/src/main.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mixer/src/main.cpp b/mixer/src/main.cpp index ea97e85d0e..24df2b5c5c 100644 --- a/mixer/src/main.cpp +++ b/mixer/src/main.cpp @@ -185,15 +185,13 @@ void *sendBuffer(void *args) // pull the earlier sample for the delayed channel int earlierSample = delaySamplePointer[s] * - distanceCoeffs[lowAgentIndex][highAgentIndex] * - otherAgentBuffer->getAttenuationRatio(); + distanceCoeffs[lowAgentIndex][highAgentIndex]; plateauAdditionOfSamples(delayedChannel[s], earlierSample * weakChannelAmplitudeRatio); } int16_t currentSample = (otherAgentBuffer->getNextOutput()[s] * - distanceCoeffs[lowAgentIndex][highAgentIndex]) * - otherAgentBuffer->getAttenuationRatio(); + distanceCoeffs[lowAgentIndex][highAgentIndex]); plateauAdditionOfSamples(goodChannel[s], currentSample); if (s + numSamplesDelay < BUFFER_LENGTH_SAMPLES_PER_CHANNEL) {