From 74452b7cc5a18106fbd421831d787716e64d528a Mon Sep 17 00:00:00 2001
From: Philip Rosedale <philip@coffeeandpower.com>
Date: Mon, 11 Mar 2013 16:24:55 -0700
Subject: [PATCH] manual merge removed ECHO_SERVER_TEST

---
 interface/src/Audio.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index b1176556f3..40c9faac7f 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -42,8 +42,6 @@ const short JITTER_BUFFER_SAMPLES = JITTER_BUFFER_LENGTH_MSECS *
 
 const float AUDIO_CALLBACK_MSECS = (float)BUFFER_LENGTH_SAMPLES / (float)SAMPLE_RATE * 1000.0;
 
-const short NUM_AUDIO_SOURCES = 2;
-const short ECHO_SERVER_TEST = 1;
 
 const int AGENT_LOOPBACK_MODIFIER = 307;
 
@@ -365,7 +363,7 @@ void Audio::getInputLoudness(float * lastLoudness, float * averageLoudness) {
 
 void Audio::render(int screenWidth, int screenHeight)
 {
-    if (initialized && ECHO_SERVER_TEST) {
+    if (initialized) {
         glBegin(GL_LINES);
         glColor3f(1,1,1);