From 2dc39512a2ef555b11831e036a51de8f23f25c92 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Fri, 18 Apr 2014 10:19:09 -0700
Subject: [PATCH] CR feedback

---
 interface/src/AudioReflector.cpp | 24 ++++++++++++------------
 interface/src/AudioReflector.h   | 24 ++++++++++++------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/interface/src/AudioReflector.cpp b/interface/src/AudioReflector.cpp
index 67b6120354..e66735c403 100644
--- a/interface/src/AudioReflector.cpp
+++ b/interface/src/AudioReflector.cpp
@@ -53,12 +53,12 @@ AudioReflector::AudioReflector(QObject* parent) :
 {
     _reflections = 0;
     _diffusionPathCount = 0;
-    _averageAttenuationOfficial = _averageAttenuation = 0.0f;
-    _maxAttenuationOfficial = _maxAttenuation = 0.0f;
-    _minAttenuationOfficial = _minAttenuation = 0.0f;
-    _averageDelayOfficial = _averageDelay = 0;
-    _maxDelayOfficial = _maxDelay = 0;
-    _minDelayOfficial = _minDelay = 0;
+    _officialAverageAttenuation = _averageAttenuation = 0.0f;
+    _officialMaxAttenuation = _maxAttenuation = 0.0f;
+    _officialMinAttenuation = _minAttenuation = 0.0f;
+    _officialAverageDelay = _averageDelay = 0;
+    _officialMaxDelay = _maxDelay = 0;
+    _officialMinDelay = _minDelay = 0;
     _inboundEchoesCount = 0;
     _inboundEchoesSuppressedCount = 0;
     _localEchoesCount = 0;
@@ -384,12 +384,12 @@ void AudioReflector::echoAudio(AudioSource source, unsigned int sampleTime, cons
         _minAttenuation = 0.0f;
     }
     
-    _maxDelayOfficial = _maxDelay;
-    _minDelayOfficial = _minDelay;
-    _maxAttenuationOfficial = _maxAttenuation;
-    _minAttenuationOfficial = _minAttenuation;
-    _averageDelayOfficial = _averageDelay;
-    _averageAttenuationOfficial = _averageAttenuation;
+    _officialMaxDelay = _maxDelay;
+    _officialMinDelay = _minDelay;
+    _officialMaxAttenuation = _maxAttenuation;
+    _officialMinAttenuation = _minAttenuation;
+    _officialAverageDelay = _averageDelay;
+    _officialAverageAttenuation = _averageAttenuation;
 
 }
 
diff --git a/interface/src/AudioReflector.h b/interface/src/AudioReflector.h
index cd5aaad276..582345e064 100644
--- a/interface/src/AudioReflector.h
+++ b/interface/src/AudioReflector.h
@@ -81,12 +81,12 @@ public:
 public slots:
     // statistics
     int getReflections() const { return _reflections; }
-    float getAverageDelayMsecs() const { return _averageDelayOfficial; }
-    float getAverageAttenuation() const { return _averageAttenuationOfficial; }
-    float getMaxDelayMsecs() const { return _maxDelayOfficial; }
-    float getMaxAttenuation() const { return _maxAttenuationOfficial; }
-    float getMinDelayMsecs() const { return _minDelayOfficial; }
-    float getMinAttenuation() const { return _minAttenuationOfficial; }
+    float getAverageDelayMsecs() const { return _officialAverageDelay; }
+    float getAverageAttenuation() const { return _officialAverageAttenuation; }
+    float getMaxDelayMsecs() const { return _officialMaxDelay; }
+    float getMaxAttenuation() const { return _officialMaxAttenuation; }
+    float getMinDelayMsecs() const { return _officialMinDelay; }
+    float getMinAttenuation() const { return _officialMinAttenuation; }
     float getDelayFromDistance(float distance);
     int getDiffusionPathCount() const { return _diffusionPathCount; }
     int getEchoesInjected() const { return _inboundEchoesCount + _localEchoesCount; }
@@ -157,17 +157,17 @@ private:
     float _averageDelay;
     float _maxDelay;
     float _minDelay;
-    float _averageDelayOfficial;
-    float _maxDelayOfficial;
-    float _minDelayOfficial;
+    float _officialAverageDelay;
+    float _officialMaxDelay;
+    float _officialMinDelay;
     int _attenuationCount;
     float _totalAttenuation;
     float _averageAttenuation;
     float _maxAttenuation;
     float _minAttenuation;
-    float _averageAttenuationOfficial;
-    float _maxAttenuationOfficial;
-    float _minAttenuationOfficial;
+    float _officialAverageAttenuation;
+    float _officialMaxAttenuation;
+    float _officialMinAttenuation;
 
 
     glm::vec3 _listenerPosition;