From ca39593f052e99b8d2e53e61cad4b83bba39bd8b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 3 Jun 2013 12:02:41 -0700
Subject: [PATCH] move typedef for FreeVerbAgentMap to AudioRingBuffer header

---
 audio-mixer/src/main.cpp              | 1 -
 libraries/audio/src/AudioRingBuffer.h | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp
index d090ed40ad..8369ff3bd0 100644
--- a/audio-mixer/src/main.cpp
+++ b/audio-mixer/src/main.cpp
@@ -248,7 +248,6 @@ int main(int argc, const char* argv[]) {
                                 numSamplesDelay = PHASE_DELAY_AT_90 * sinRatio;
                                 weakChannelAmplitudeRatio = 1 - (PHASE_AMPLITUDE_RATIO_AT_90 * sinRatio);
                                 
-                                typedef std::map<uint16_t, stk::FreeVerb*> FreeVerbAgentMap;
                                 FreeVerbAgentMap& agentFreeVerbs = agentRingBuffer->getFreeVerbs();
                                 FreeVerbAgentMap::iterator freeVerbIterator = agentFreeVerbs.find(otherAgent->getAgentID());
                                 
diff --git a/libraries/audio/src/AudioRingBuffer.h b/libraries/audio/src/AudioRingBuffer.h
index 391c0a421c..cecf97a7e4 100644
--- a/libraries/audio/src/AudioRingBuffer.h
+++ b/libraries/audio/src/AudioRingBuffer.h
@@ -19,6 +19,7 @@
 #include "AgentData.h"
 
 const int STREAM_IDENTIFIER_NUM_BYTES = 8;
+typedef std::map<uint16_t, stk::FreeVerb*> FreeVerbAgentMap;
 
 class AudioRingBuffer : public AgentData {
 public:
@@ -35,7 +36,7 @@ public:
     
     int16_t* getBuffer() const { return _buffer; }
     
-    std::map<uint16_t, stk::FreeVerb*>& getFreeVerbs() { return _freeVerbs; }
+    FreeVerbAgentMap& getFreeVerbs() { return _freeVerbs; }
     
     bool isStarted() const { return _started; }
     void setStarted(bool started) { _started = started; }
@@ -67,7 +68,7 @@ private:
     bool _shouldBeAddedToMix;
     bool _shouldLoopbackForAgent;
     unsigned char _streamIdentifier[STREAM_IDENTIFIER_NUM_BYTES];
-    std::map<uint16_t, stk::FreeVerb*> _freeVerbs;
+    FreeVerbAgentMap _freeVerbs;
 };
 
 #endif /* defined(__interface__AudioRingBuffer__) */