From 12f0237dc7df928dd87dcbb628034056070c4e6d Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 24 Oct 2014 14:56:56 -0700
Subject: [PATCH] Cleanup

---
 assignment-client/src/audio/AudioMixer.cpp | 24 +++++++++++-----------
 libraries/audio/src/InboundAudioStream.cpp |  1 -
 libraries/audio/src/InboundAudioStream.h   |  5 ++---
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index afde574ae2..bd3e37c0ae 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -638,7 +638,7 @@ void AudioMixer::run() {
     int nextFrame = 0;
     QElapsedTimer timer;
     timer.start();
-    
+
     char clientMixBuffer[MAX_PACKET_SIZE];
     char clientEnvBuffer[MAX_PACKET_SIZE];
     
@@ -719,13 +719,13 @@ void AudioMixer::run() {
                     && nodeData->getAvatarAudioStream()) {
 
                     int streamsMixed = prepareMixForListeningNode(node.data());
-                    
+
                     char* mixDataAt;
                     if (streamsMixed > 0) {
-                        // pack headers
+                        // pack header
                         int numBytesMixPacketHeader = populatePacketHeader(clientMixBuffer, PacketTypeMixedAudio);
                         mixDataAt = clientMixBuffer + numBytesMixPacketHeader;
-                        
+
                         // pack sequence number
                         quint16 sequence = nodeData->getOutgoingSequenceNumber();
                         memcpy(mixDataAt, &sequence, sizeof(quint16));
@@ -741,8 +741,7 @@ void AudioMixer::run() {
                         // find reverb properties
                         for (int i = 0; i < _zoneReverbSettings.size(); ++i) {
                             AudioMixerClientData* data = static_cast<AudioMixerClientData*>(node->getLinkedData());
-                            AvatarAudioStream* stream = data->getAvatarAudioStream();
-                            glm::vec3 streamPosition = stream->getPosition();
+                            glm::vec3 streamPosition = data->getAvatarAudioStream()->getPosition();
                             if (_audioZones[_zoneReverbSettings[i].zone].contains(streamPosition)) {
                                 hasReverb = true;
                                 reverbTime = _zoneReverbSettings[i].reverbTime;
@@ -754,11 +753,13 @@ void AudioMixer::run() {
                         bool dataChanged = (stream->hasReverb() != hasReverb) ||
                                             (stream->hasReverb() && (stream->getRevebTime() != reverbTime ||
                                                                      stream->getWetLevel() != wetLevel));
-                        // Update stream
-                        if (hasReverb) {
-                            stream->setReverb(reverbTime, wetLevel);
-                        } else {
-                            stream->clearReverb();
+                        if (dataChanged) {                            
+                            // Update stream
+                            if (hasReverb) {
+                                stream->setReverb(reverbTime, wetLevel);
+                            } else {
+                                stream->clearReverb();
+                            }
                         }
                         
                         // Send at change or every so often
@@ -770,7 +771,6 @@ void AudioMixer::run() {
                             char* envDataAt = clientEnvBuffer + numBytesEnvPacketHeader;
                             
                             unsigned char bitset = 0;
-                            setAtBit(bitset, HAS_DATA_BIT);
                             if (hasReverb) {
                                 setAtBit(bitset, HAS_REVERB_BIT);
                             }
diff --git a/libraries/audio/src/InboundAudioStream.cpp b/libraries/audio/src/InboundAudioStream.cpp
index 12449a9879..366659b633 100644
--- a/libraries/audio/src/InboundAudioStream.cpp
+++ b/libraries/audio/src/InboundAudioStream.cpp
@@ -13,7 +13,6 @@
 
 #include "InboundAudioStream.h"
 #include "PacketHeaders.h"
-#include <SharedUtil.h>
 
 const int STARVE_HISTORY_CAPACITY = 50;
 
diff --git a/libraries/audio/src/InboundAudioStream.h b/libraries/audio/src/InboundAudioStream.h
index 737147e2ba..ad2b7266ed 100644
--- a/libraries/audio/src/InboundAudioStream.h
+++ b/libraries/audio/src/InboundAudioStream.h
@@ -45,9 +45,8 @@ const int DEFAULT_WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES = 50;
 const int DEFAULT_WINDOW_SECONDS_FOR_DESIRED_REDUCTION = 10;
 const bool DEFAULT_REPETITION_WITH_FADE = true;
 
-// Mixed Audio bitset
-const int HAS_DATA_BIT = 0; // 1st bit
-const int HAS_REVERB_BIT = 1; // 2nd bit
+// Audio Env bitset
+const int HAS_REVERB_BIT = 0; // 1st bit
 
 class InboundAudioStream : public NodeData {
     Q_OBJECT