From 3984a80bf702066ba16f3383154729b79db50689 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 30 May 2013 16:15:04 -0700
Subject: [PATCH] some refactor to re-use the FreeVerb effect

---
 audio-mixer/src/main.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp
index 610a564ff6..47389a51ce 100644
--- a/audio-mixer/src/main.cpp
+++ b/audio-mixer/src/main.cpp
@@ -116,8 +116,6 @@ int main(int argc, const char* argv[]) {
     const float DISTANCE_REVERB_ROOM_SIZE = 0.75f;
     const float DISTANCE_REVERB_WIDTH = 0.5f;
     
-    stk::FreeVerb freeVerb;
-    
     gettimeofday(&startTime, NULL);
     
     while (true) {
@@ -164,7 +162,8 @@ int main(int argc, const char* argv[]) {
                             int numSamplesDelay = 0;
                             float weakChannelAmplitudeRatio = 1.f;
                             
-                            // echo effect mix is 0
+                            // setup the FreeVerb object for this client and source
+                            stk::FreeVerb freeVerb;
                             freeVerb.setEffectMix(0.0f);
                             
                             if (otherAgent != agent) {
@@ -248,6 +247,8 @@ int main(int argc, const char* argv[]) {
                                 freeVerb.setDamping(DISTANCE_REVERB_DAMPING);
                                 freeVerb.setRoomSize(DISTANCE_REVERB_ROOM_SIZE);
                                 freeVerb.setWidth(DISTANCE_REVERB_WIDTH);
+                                
+                                printf("EM set to %f\n", audioFactors[lowAgentIndex][highAgentIndex].effectMix);
                                 freeVerb.setEffectMix(audioFactors[lowAgentIndex][highAgentIndex].effectMix);
                                 
                                 bearingRelativeAngleToSource *= (M_PI / 180);
@@ -300,9 +301,6 @@ int main(int argc, const char* argv[]) {
                 
                 memcpy(clientPacket + 1, clientSamples, sizeof(clientSamples));
                 agentList->getAgentSocket()->send(agent->getPublicSocket(), clientPacket, BUFFER_LENGTH_BYTES + 1);
-                
-                // clear the FreeVerb to be re-used on next iteration
-                freeVerb.clear();
             }
         }