From 195186f72688749501445f6f6d0949f32aa5ff15 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 9 Oct 2014 11:48:41 -0700
Subject: [PATCH 01/15] Removed redundant TREE_SCALE declaration

---
 libraries/voxels/src/VoxelDetail.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/voxels/src/VoxelDetail.h b/libraries/voxels/src/VoxelDetail.h
index b94601392b..5ef7f0ff4e 100644
--- a/libraries/voxels/src/VoxelDetail.h
+++ b/libraries/voxels/src/VoxelDetail.h
@@ -15,6 +15,7 @@
 #include <QtScript/QScriptEngine>
 
 #include <AACube.h>
+#include <OctreeConstants.h>
 #include <SharedUtil.h>
 #include "VoxelConstants.h"
 
@@ -53,8 +54,6 @@ void rayToVoxelIntersectionResultFromScriptValue(const QScriptValue& object, Ray
 
 
 inline QDebug operator<<(QDebug debug, const VoxelDetail& details) {
-    const int TREE_SCALE = 16384; // ~10 miles.. This is the number of meters of the 0.0 to 1.0 voxel universe
-
     debug << "VoxelDetail[ (" 
             << details.x * (float)TREE_SCALE << "," << details.y * (float)TREE_SCALE << "," << details.z * (float)TREE_SCALE 
             << " ) to ("

From 981666cb385908757a6edf0413aa104858616359 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 9 Oct 2014 11:49:55 -0700
Subject: [PATCH 02/15] Moved audioMixer setting parsing to its own function

---
 assignment-client/src/audio/AudioMixer.cpp | 271 ++++++++++++---------
 assignment-client/src/audio/AudioMixer.h   |   3 +
 2 files changed, 162 insertions(+), 112 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 37d89f3790..d5fa108fe3 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -46,6 +46,7 @@
 #include <NetworkAccessManager.h>
 #include <NodeList.h>
 #include <Node.h>
+#include <OctreeConstants.h>
 #include <PacketHeaders.h>
 #include <SharedUtil.h>
 #include <StdDev.h>
@@ -65,6 +66,7 @@ const float LOUDNESS_TO_DISTANCE_RATIO = 0.00001f;
 const float DEFAULT_ATTENUATION_PER_DOUBLING_IN_DISTANCE = 0.18;
 
 const QString AUDIO_MIXER_LOGGING_TARGET_NAME = "audio-mixer";
+const QString AUDIO_GROUP_KEY = "audio";
 
 void attachNewNodeDataToNode(Node *newNode) {
     if (!newNode->getLinkedData()) {
@@ -637,119 +639,8 @@ void AudioMixer::run() {
     const QJsonObject& settingsObject = domainHandler.getSettingsObject();
     
     // check the settings object to see if we have anything we can parse out
-    const QString AUDIO_GROUP_KEY = "audio";
-    
     if (settingsObject.contains(AUDIO_GROUP_KEY)) {
-        QJsonObject audioGroupObject = settingsObject[AUDIO_GROUP_KEY].toObject();
-
-        // check the payload to see if we have asked for dynamicJitterBuffer support
-        const QString DYNAMIC_JITTER_BUFFER_JSON_KEY = "dynamic_jitter_buffer";
-        _streamSettings._dynamicJitterBuffers = audioGroupObject[DYNAMIC_JITTER_BUFFER_JSON_KEY].toBool();
-        if (_streamSettings._dynamicJitterBuffers) {
-            qDebug() << "Enable dynamic jitter buffers.";
-        } else {
-            qDebug() << "Dynamic jitter buffers disabled.";
-        }
-        
-        bool ok;
-        const QString DESIRED_JITTER_BUFFER_FRAMES_KEY = "static_desired_jitter_buffer_frames";
-        _streamSettings._staticDesiredJitterBufferFrames = audioGroupObject[DESIRED_JITTER_BUFFER_FRAMES_KEY].toString().toInt(&ok);
-        if (!ok) {
-            _streamSettings._staticDesiredJitterBufferFrames = DEFAULT_STATIC_DESIRED_JITTER_BUFFER_FRAMES;
-        }
-        qDebug() << "Static desired jitter buffer frames:" << _streamSettings._staticDesiredJitterBufferFrames;
-
-        const QString MAX_FRAMES_OVER_DESIRED_JSON_KEY = "max_frames_over_desired";
-        _streamSettings._maxFramesOverDesired = audioGroupObject[MAX_FRAMES_OVER_DESIRED_JSON_KEY].toString().toInt(&ok);
-        if (!ok) {
-            _streamSettings._maxFramesOverDesired = DEFAULT_MAX_FRAMES_OVER_DESIRED;
-        }
-        qDebug() << "Max frames over desired:" << _streamSettings._maxFramesOverDesired;
-        
-        const QString USE_STDEV_FOR_DESIRED_CALC_JSON_KEY = "use_stdev_for_desired_calc";
-        _streamSettings._useStDevForJitterCalc = audioGroupObject[USE_STDEV_FOR_DESIRED_CALC_JSON_KEY].toBool();
-        if (_streamSettings._useStDevForJitterCalc) {
-            qDebug() << "Using Philip's stdev method for jitter calc if dynamic jitter buffers enabled";
-        } else {
-            qDebug() << "Using Fred's max-gap method for jitter calc if dynamic jitter buffers enabled";
-        }
-
-        const QString WINDOW_STARVE_THRESHOLD_JSON_KEY = "window_starve_threshold";
-        _streamSettings._windowStarveThreshold = audioGroupObject[WINDOW_STARVE_THRESHOLD_JSON_KEY].toString().toInt(&ok);
-        if (!ok) {
-            _streamSettings._windowStarveThreshold = DEFAULT_WINDOW_STARVE_THRESHOLD;
-        }
-        qDebug() << "Window A starve threshold:" << _streamSettings._windowStarveThreshold;
-
-        const QString WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES_JSON_KEY = "window_seconds_for_desired_calc_on_too_many_starves";
-        _streamSettings._windowSecondsForDesiredCalcOnTooManyStarves = audioGroupObject[WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES_JSON_KEY].toString().toInt(&ok);
-        if (!ok) {
-            _streamSettings._windowSecondsForDesiredCalcOnTooManyStarves = DEFAULT_WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES;
-        }
-        qDebug() << "Window A length:" << _streamSettings._windowSecondsForDesiredCalcOnTooManyStarves << "seconds";
-
-        const QString WINDOW_SECONDS_FOR_DESIRED_REDUCTION_JSON_KEY = "window_seconds_for_desired_reduction";
-        _streamSettings._windowSecondsForDesiredReduction = audioGroupObject[WINDOW_SECONDS_FOR_DESIRED_REDUCTION_JSON_KEY].toString().toInt(&ok);
-        if (!ok) {
-            _streamSettings._windowSecondsForDesiredReduction = DEFAULT_WINDOW_SECONDS_FOR_DESIRED_REDUCTION;
-        }
-        qDebug() << "Window B length:" << _streamSettings._windowSecondsForDesiredReduction << "seconds";
-
-        const QString REPETITION_WITH_FADE_JSON_KEY = "repetition_with_fade";
-        _streamSettings._repetitionWithFade = audioGroupObject[REPETITION_WITH_FADE_JSON_KEY].toBool();
-        if (_streamSettings._repetitionWithFade) {
-            qDebug() << "Repetition with fade enabled";
-        } else {
-            qDebug() << "Repetition with fade disabled";
-        }
-        
-        const QString PRINT_STREAM_STATS_JSON_KEY = "print_stream_stats";
-        _printStreamStats = audioGroupObject[PRINT_STREAM_STATS_JSON_KEY].toBool();
-        if (_printStreamStats) {
-            qDebug() << "Stream stats will be printed to stdout";
-        }
-
-        const QString FILTER_KEY = "enable_filter";
-        if (audioGroupObject[FILTER_KEY].isBool()) {
-            _enableFilter = audioGroupObject[FILTER_KEY].toBool();
-        }
-        if (_enableFilter) {
-            qDebug() << "Filter enabled";
-        }
-        
-        const QString UNATTENUATED_ZONE_KEY = "unattenuated_zone";
-
-        QString unattenuatedZoneString = audioGroupObject[UNATTENUATED_ZONE_KEY].toString();
-        if (!unattenuatedZoneString.isEmpty()) {
-            QStringList zoneStringList = unattenuatedZoneString.split(',');
-
-            glm::vec3 sourceCorner(zoneStringList[0].toFloat(), zoneStringList[1].toFloat(), zoneStringList[2].toFloat());
-            glm::vec3 sourceDimensions(zoneStringList[3].toFloat(), zoneStringList[4].toFloat(), zoneStringList[5].toFloat());
-
-            glm::vec3 listenerCorner(zoneStringList[6].toFloat(), zoneStringList[7].toFloat(), zoneStringList[8].toFloat());
-            glm::vec3 listenerDimensions(zoneStringList[9].toFloat(), zoneStringList[10].toFloat(), zoneStringList[11].toFloat());
-
-            _sourceUnattenuatedZone = new AABox(sourceCorner, sourceDimensions);
-            _listenerUnattenuatedZone = new AABox(listenerCorner, listenerDimensions);
-
-            glm::vec3 sourceCenter = _sourceUnattenuatedZone->calcCenter();
-            glm::vec3 destinationCenter = _listenerUnattenuatedZone->calcCenter();
-
-            qDebug() << "There is an unattenuated zone with source center at"
-                << QString("%1, %2, %3").arg(sourceCenter.x).arg(sourceCenter.y).arg(sourceCenter.z);
-            qDebug() << "Buffers inside this zone will not be attenuated inside a box with center at"
-                << QString("%1, %2, %3").arg(destinationCenter.x).arg(destinationCenter.y).arg(destinationCenter.z);
-        }
-        
-        const QString ATTENATION_PER_DOULING_IN_DISTANCE = "attenuation_per_doubling_in_distance";
-        if (audioGroupObject[ATTENATION_PER_DOULING_IN_DISTANCE].isString()) {
-            bool ok = false;
-            float attenuation = audioGroupObject[ATTENATION_PER_DOULING_IN_DISTANCE].toString().toFloat(&ok);
-            if (ok) {
-                _attenuationPerDoublingInDistance = attenuation;
-                qDebug() << "Attenuation per doubling in distance changed to" << _attenuationPerDoublingInDistance;
-            }
-        }
+        parseSettingsObject(settingsObject);
     }
     
     int nextFrame = 0;
@@ -982,3 +873,159 @@ QString AudioMixer::getReadPendingDatagramsHashMatchTimeStatsString() const {
         + " prct_time_in_hashmatch_1s: " + QString::number(_timeSpentPerHashMatchCallStats.getLastCompleteIntervalStats().getSum() / USECS_PER_SECOND * 100.0, 'f', 6) + "%";
     return result;
 }
+
+void AudioMixer::parseSettingsObject(const QJsonObject &settingsObject) {
+    QJsonObject audioGroupObject = settingsObject[AUDIO_GROUP_KEY].toObject();
+    
+    // check the payload to see if we have asked for dynamicJitterBuffer support
+    const QString DYNAMIC_JITTER_BUFFER_JSON_KEY = "dynamic_jitter_buffer";
+    _streamSettings._dynamicJitterBuffers = audioGroupObject[DYNAMIC_JITTER_BUFFER_JSON_KEY].toBool();
+    if (_streamSettings._dynamicJitterBuffers) {
+        qDebug() << "Enable dynamic jitter buffers.";
+    } else {
+        qDebug() << "Dynamic jitter buffers disabled.";
+    }
+    
+    bool ok;
+    const QString DESIRED_JITTER_BUFFER_FRAMES_KEY = "static_desired_jitter_buffer_frames";
+    _streamSettings._staticDesiredJitterBufferFrames = audioGroupObject[DESIRED_JITTER_BUFFER_FRAMES_KEY].toString().toInt(&ok);
+    if (!ok) {
+        _streamSettings._staticDesiredJitterBufferFrames = DEFAULT_STATIC_DESIRED_JITTER_BUFFER_FRAMES;
+    }
+    qDebug() << "Static desired jitter buffer frames:" << _streamSettings._staticDesiredJitterBufferFrames;
+    
+    const QString MAX_FRAMES_OVER_DESIRED_JSON_KEY = "max_frames_over_desired";
+    _streamSettings._maxFramesOverDesired = audioGroupObject[MAX_FRAMES_OVER_DESIRED_JSON_KEY].toString().toInt(&ok);
+    if (!ok) {
+        _streamSettings._maxFramesOverDesired = DEFAULT_MAX_FRAMES_OVER_DESIRED;
+    }
+    qDebug() << "Max frames over desired:" << _streamSettings._maxFramesOverDesired;
+    
+    const QString USE_STDEV_FOR_DESIRED_CALC_JSON_KEY = "use_stdev_for_desired_calc";
+    _streamSettings._useStDevForJitterCalc = audioGroupObject[USE_STDEV_FOR_DESIRED_CALC_JSON_KEY].toBool();
+    if (_streamSettings._useStDevForJitterCalc) {
+        qDebug() << "Using Philip's stdev method for jitter calc if dynamic jitter buffers enabled";
+    } else {
+        qDebug() << "Using Fred's max-gap method for jitter calc if dynamic jitter buffers enabled";
+    }
+    
+    const QString WINDOW_STARVE_THRESHOLD_JSON_KEY = "window_starve_threshold";
+    _streamSettings._windowStarveThreshold = audioGroupObject[WINDOW_STARVE_THRESHOLD_JSON_KEY].toString().toInt(&ok);
+    if (!ok) {
+        _streamSettings._windowStarveThreshold = DEFAULT_WINDOW_STARVE_THRESHOLD;
+    }
+    qDebug() << "Window A starve threshold:" << _streamSettings._windowStarveThreshold;
+    
+    const QString WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES_JSON_KEY = "window_seconds_for_desired_calc_on_too_many_starves";
+    _streamSettings._windowSecondsForDesiredCalcOnTooManyStarves = audioGroupObject[WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES_JSON_KEY].toString().toInt(&ok);
+    if (!ok) {
+        _streamSettings._windowSecondsForDesiredCalcOnTooManyStarves = DEFAULT_WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES;
+    }
+    qDebug() << "Window A length:" << _streamSettings._windowSecondsForDesiredCalcOnTooManyStarves << "seconds";
+    
+    const QString WINDOW_SECONDS_FOR_DESIRED_REDUCTION_JSON_KEY = "window_seconds_for_desired_reduction";
+    _streamSettings._windowSecondsForDesiredReduction = audioGroupObject[WINDOW_SECONDS_FOR_DESIRED_REDUCTION_JSON_KEY].toString().toInt(&ok);
+    if (!ok) {
+        _streamSettings._windowSecondsForDesiredReduction = DEFAULT_WINDOW_SECONDS_FOR_DESIRED_REDUCTION;
+    }
+    qDebug() << "Window B length:" << _streamSettings._windowSecondsForDesiredReduction << "seconds";
+    
+    const QString REPETITION_WITH_FADE_JSON_KEY = "repetition_with_fade";
+    _streamSettings._repetitionWithFade = audioGroupObject[REPETITION_WITH_FADE_JSON_KEY].toBool();
+    if (_streamSettings._repetitionWithFade) {
+        qDebug() << "Repetition with fade enabled";
+    } else {
+        qDebug() << "Repetition with fade disabled";
+    }
+    
+    const QString PRINT_STREAM_STATS_JSON_KEY = "print_stream_stats";
+    _printStreamStats = audioGroupObject[PRINT_STREAM_STATS_JSON_KEY].toBool();
+    if (_printStreamStats) {
+        qDebug() << "Stream stats will be printed to stdout";
+    }
+    
+    const QString FILTER_KEY = "enable_filter";
+    if (audioGroupObject[FILTER_KEY].isBool()) {
+        _enableFilter = audioGroupObject[FILTER_KEY].toBool();
+    }
+    if (_enableFilter) {
+        qDebug() << "Filter enabled";
+    }
+    
+    const QString UNATTENUATED_ZONE_KEY = "unattenuated_zone";
+    
+    QString unattenuatedZoneString = audioGroupObject[UNATTENUATED_ZONE_KEY].toString();
+    if (!unattenuatedZoneString.isEmpty()) {
+        QStringList zoneStringList = unattenuatedZoneString.split(',');
+        
+        glm::vec3 sourceCorner(zoneStringList[0].toFloat(), zoneStringList[1].toFloat(), zoneStringList[2].toFloat());
+        glm::vec3 sourceDimensions(zoneStringList[3].toFloat(), zoneStringList[4].toFloat(), zoneStringList[5].toFloat());
+        
+        glm::vec3 listenerCorner(zoneStringList[6].toFloat(), zoneStringList[7].toFloat(), zoneStringList[8].toFloat());
+        glm::vec3 listenerDimensions(zoneStringList[9].toFloat(), zoneStringList[10].toFloat(), zoneStringList[11].toFloat());
+        
+        _sourceUnattenuatedZone = new AABox(sourceCorner, sourceDimensions);
+        _listenerUnattenuatedZone = new AABox(listenerCorner, listenerDimensions);
+        
+        glm::vec3 sourceCenter = _sourceUnattenuatedZone->calcCenter();
+        glm::vec3 destinationCenter = _listenerUnattenuatedZone->calcCenter();
+        
+        qDebug() << "There is an unattenuated zone with source center at"
+        << QString("%1, %2, %3").arg(sourceCenter.x).arg(sourceCenter.y).arg(sourceCenter.z);
+        qDebug() << "Buffers inside this zone will not be attenuated inside a box with center at"
+        << QString("%1, %2, %3").arg(destinationCenter.x).arg(destinationCenter.y).arg(destinationCenter.z);
+    }
+    
+    const QString ATTENATION_PER_DOULING_IN_DISTANCE = "attenuation_per_doubling_in_distance";
+    if (audioGroupObject[ATTENATION_PER_DOULING_IN_DISTANCE].isString()) {
+        bool ok = false;
+        float attenuation = audioGroupObject[ATTENATION_PER_DOULING_IN_DISTANCE].toString().toFloat(&ok);
+        if (ok) {
+            _attenuationPerDoublingInDistance = attenuation;
+            qDebug() << "Attenuation per doubling in distance changed to" << _attenuationPerDoublingInDistance;
+        }
+    }
+    
+    const QString AUDIO_ZONES = "zones";
+    if (audioGroupObject[AUDIO_ZONES].isObject()) {
+        const QJsonObject& zones = audioGroupObject[AUDIO_ZONES].toObject();
+        
+        const QString X_RANGE = "x_range";
+        const QString Y_RANGE = "y_range";
+        const QString Z_RANGE = "z_range";
+        foreach (const QString& zone, zones.keys()) {
+            QJsonObject zoneObject = zones[zone].toObject();
+            
+            if (zoneObject.contains(X_RANGE) && zoneObject.contains(Y_RANGE) && zoneObject.contains(Z_RANGE)) {
+                QStringList xRange = zoneObject.value(X_RANGE).toString().split("-", QString::SkipEmptyParts);
+                QStringList yRange = zoneObject.value(Y_RANGE).toString().split("-", QString::SkipEmptyParts);
+                QStringList zRange = zoneObject.value(Z_RANGE).toString().split("-", QString::SkipEmptyParts);
+                
+                if (xRange.size() == 2 && yRange.size() == 2 && zRange.size() == 2) {
+                    float xMin, xMax, yMin, yMax, zMin, zMax;
+                    bool ok, allOk = true;
+                    xMin = xRange[0].toFloat(&ok) / (float)TREE_SCALE;
+                    allOk &= ok;
+                    xMax = xRange[1].toFloat(&ok) / (float)TREE_SCALE;
+                    allOk &= ok;
+                    yMin = yRange[0].toFloat(&ok) / (float)TREE_SCALE;
+                    allOk &= ok;
+                    yMax = yRange[1].toFloat(&ok) / (float)TREE_SCALE;
+                    allOk &= ok;
+                    zMin = zRange[0].toFloat(&ok) / (float)TREE_SCALE;
+                    allOk &= ok;
+                    zMax = zRange[1].toFloat(&ok) / (float)TREE_SCALE;
+                    allOk &= ok;
+                    
+                    if (allOk) {
+                        glm::vec3 corner(xMin, yMin, zMin);
+                        glm::vec3 dimension(xMax - xMin, yMax - yMin, zMax - zMin);
+                        AABox zoneAABox(corner, dimension);
+                        _audioZones.insert(zone, zoneAABox);
+                        qDebug() << "Added zone:" << zoneAABox;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/assignment-client/src/audio/AudioMixer.h b/assignment-client/src/audio/AudioMixer.h
index 4d08d480f8..ca1b610051 100644
--- a/assignment-client/src/audio/AudioMixer.h
+++ b/assignment-client/src/audio/AudioMixer.h
@@ -66,6 +66,8 @@ private:
     QString getReadPendingDatagramsTimeStatsString() const;
     QString getReadPendingDatagramsHashMatchTimeStatsString() const;
     
+    void parseSettingsObject(const QJsonObject& settingsObject);
+    
     float _trailingSleepRatio;
     float _minAudibilityThreshold;
     float _performanceThrottlingRatio;
@@ -75,6 +77,7 @@ private:
     int _sumMixes;
     AABox* _sourceUnattenuatedZone;
     AABox* _listenerUnattenuatedZone;
+    QHash<QString, AABox> _audioZones;
 
     static InboundAudioStream::Settings _streamSettings;
 

From e7ecf1cd6fb3abd9c9e8603d2fd6c264927fd565 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 9 Oct 2014 12:38:07 -0700
Subject: [PATCH 03/15] Optional labels

---
 domain-server/resources/web/js/settings.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 130000fc9c..4a4f882d99 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -25,7 +25,9 @@ var viewHelpers = {
       + " trigger-change' data-short-name='" + setting.name + "' name='" + setting_name + "' "
     
     if (setting.type === 'checkbox') {
-      form_group += "<label class='" + label_class + "'>" + setting.label + "</label>"
+      if (setting.label) {
+        form_group += "<label class='" + label_class + "'>" + setting.label + "</label>"
+      }
       form_group += "<div class='checkbox" + (isLocked ? " disabled" : "") + "'>"
       form_group += "<label for='" + setting_name + "'>"
       form_group += "<input type='checkbox'" + common_attrs + (setting_value ? "checked" : "") + (isLocked ? " disabled" : "") + "/>"
@@ -35,8 +37,10 @@ var viewHelpers = {
       form_group += makeTable(setting, setting_name, setting_value);
     } else {
       input_type = _.has(setting, 'type') ? setting.type : "text"
-      
-      form_group += "<label for='" + setting_name + "' class='" + label_class + "'>" + setting.label + "</label>";
+
+      if (setting.label) {
+        form_group += "<label for='" + setting_name + "' class='" + label_class + "'>" + setting.label + "</label>";
+      }
       
       if (setting.type === 'select') {
         form_group += "<select class='form-control' data-hidden-input='" + setting_name + "'>'"
@@ -208,7 +212,7 @@ $('body').on('click', '.save-button', function(e){
 function makeTable(setting, setting_name, setting_value) {
   var isArray = !_.has(setting, 'key')
   
-  var html = "<label class='control-label'>" + setting.label + "</label>"
+  var html = (setting.label) ? "<label class='control-label'>" + setting.label + "</label>" : ""
   html += "<span class='help-block'>" + setting.help + "</span>"
   html += "<table class='table table-bordered' data-short-name='" + setting.name + "' name='" + setting_name + (isArray ? "[]" : "") 
     + "' data-setting-type='" + (isArray ? 'array' : 'hash') + "'>"

From 72e4785db2d17a7858dfabac8262d3fe3ee950ac Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 9 Oct 2014 12:38:46 -0700
Subject: [PATCH 04/15] Reorganized settings

---
 .../resources/describe-settings.json          | 71 +++++++++++++------
 1 file changed, 49 insertions(+), 22 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 64441446a8..e7b9f1ca6c 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -64,9 +64,23 @@
   },
   {
     "name": "audio",
-    "label": "Audio",
+    "label": "Audio Environment",
     "assignment-types": [0],
     "settings": [
+      {
+        "name": "attenuation_per_doubling_in_distance",
+        "label": "Default Domain Attenuation",
+        "help": "Factor between 0 and 1.0 (0: No attenuation, 1.0: extreme attenuation)",
+        "placeholder": "0.18",
+        "default": "0.18",
+        "advanced": false
+      },
+      {
+        "name": "enable_filter",
+        "type": "checkbox",
+        "help": "positional audio stream uses lowpass filter",
+        "default": true
+      },
       {
         "name": "zones",
         "type": "table",
@@ -76,7 +90,7 @@
         "key": {
           "name": "name",
           "label": "Name",
-          "placeholder": "Zone name"
+          "placeholder": "Zone_Name"
         },
         "columns": [
           {
@@ -100,26 +114,39 @@
         ]
       },
       {
-        "name": "enable_filter",
-        "type": "checkbox",
-        "label": "Positional filter",
-        "help": "positional audio stream uses lowpass filter",
-        "default": true
-      },
-      {
-        "name": "unattenuated_zone",
-        "label": "Unattenuated Zone",
-        "help": "Boxes for source and listener (corner x, corner y, corner z, size x, size y, size z, corner x, corner y, corner z, size x, size y, size z)",
-        "placeholder": "no zone"
-      },
-      {
-        "name": "attenuation_per_doubling_in_distance",
-        "label": "Attenuation per doubling in distance",
-        "help": "Factor between 0.0 and 1.0 (0.0: No attenuation, 1.0: extreme attenuation)",
-        "placeholder": "0.18",
-        "default": "0.18",
-        "advanced": false
-      },
+        "name": "attenuation_coefficients",
+        "type": "table",
+        "label": "Attenuation Coefficients",
+        "help": "In this table you can set custom attenuation coefficients between audio zones",
+        "numbered": false,
+        "columns": [
+          {
+            "name": "source",
+            "label": "Source",
+            "can_set": true,
+            "placeholder": "Zone_A"
+          },
+          {
+            "name": "listener",
+            "label": "Listener",
+            "can_set": true,
+            "placeholder": "Zone_B"
+          },
+          {
+            "name": "coefficient",
+            "label": "Attenuation coefficient",
+            "can_set": true,
+            "placeholder": "0.18"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "audio_advanced",
+    "label": "Audio Buffer",
+    "assignment-types": [0],
+    "settings": [
       {
         "name": "dynamic_jitter_buffer",
         "type": "checkbox",

From 06007863d2975a6a049f3abf8f2149afc580b3f7 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 9 Oct 2014 12:39:00 -0700
Subject: [PATCH 05/15] Fixed placeholder

---
 domain-server/resources/web/js/settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 4a4f882d99..ac1b40eff9 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -289,7 +289,7 @@ function makeTableInputs(setting) {
   
   _.each(setting.columns, function(col) {
     html += "<td class='row-data'name='" + col.name + "'>\
-             <input type='text' class='form-control' placeholder='" + (col.key ? col.key : "") + "' value=''>\
+             <input type='text' class='form-control' placeholder='" + (col.placeholder ? col.placeholder : "") + "' value=''>\
              </td>"
   })
   

From 06bd9ba16e29118ae04d181897825fe8664e197a Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 9 Oct 2014 14:39:31 -0700
Subject: [PATCH 06/15] Split settings parsing according to new structure

---
 assignment-client/src/audio/AudioMixer.cpp | 265 ++++++++++-----------
 1 file changed, 123 insertions(+), 142 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index d5fa108fe3..49991a02c5 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -66,7 +66,8 @@ const float LOUDNESS_TO_DISTANCE_RATIO = 0.00001f;
 const float DEFAULT_ATTENUATION_PER_DOUBLING_IN_DISTANCE = 0.18;
 
 const QString AUDIO_MIXER_LOGGING_TARGET_NAME = "audio-mixer";
-const QString AUDIO_GROUP_KEY = "audio";
+const QString AUDIO_ENV_GROUP_KEY = "audio_env";
+const QString AUDIO_BUFFER_GROUP_KEY = "audio_buffer";
 
 void attachNewNodeDataToNode(Node *newNode) {
     if (!newNode->getLinkedData()) {
@@ -122,9 +123,9 @@ int AudioMixer::addStreamToMixForListeningNodeWithStream(AudioMixerClientData* l
     // This improves the perceived quality of the audio slightly.
     
     bool showDebug = false;  // (randFloat() < 0.05f);
-
+    
     float repeatedFrameFadeFactor = 1.0f;
-
+    
     if (!streamToAdd->lastPopSucceeded()) {
         if (_streamSettings._repetitionWithFade && !streamToAdd->getLastPopOutput().isNull()) {
             // reptition with fade is enabled, and we do have a valid previous frame to repeat.
@@ -639,9 +640,7 @@ void AudioMixer::run() {
     const QJsonObject& settingsObject = domainHandler.getSettingsObject();
     
     // check the settings object to see if we have anything we can parse out
-    if (settingsObject.contains(AUDIO_GROUP_KEY)) {
-        parseSettingsObject(settingsObject);
-    }
+    parseSettingsObject(settingsObject);
     
     int nextFrame = 0;
     QElapsedTimer timer;
@@ -875,154 +874,136 @@ QString AudioMixer::getReadPendingDatagramsHashMatchTimeStatsString() const {
 }
 
 void AudioMixer::parseSettingsObject(const QJsonObject &settingsObject) {
-    QJsonObject audioGroupObject = settingsObject[AUDIO_GROUP_KEY].toObject();
-    
-    // check the payload to see if we have asked for dynamicJitterBuffer support
-    const QString DYNAMIC_JITTER_BUFFER_JSON_KEY = "dynamic_jitter_buffer";
-    _streamSettings._dynamicJitterBuffers = audioGroupObject[DYNAMIC_JITTER_BUFFER_JSON_KEY].toBool();
-    if (_streamSettings._dynamicJitterBuffers) {
-        qDebug() << "Enable dynamic jitter buffers.";
-    } else {
-        qDebug() << "Dynamic jitter buffers disabled.";
-    }
-    
-    bool ok;
-    const QString DESIRED_JITTER_BUFFER_FRAMES_KEY = "static_desired_jitter_buffer_frames";
-    _streamSettings._staticDesiredJitterBufferFrames = audioGroupObject[DESIRED_JITTER_BUFFER_FRAMES_KEY].toString().toInt(&ok);
-    if (!ok) {
-        _streamSettings._staticDesiredJitterBufferFrames = DEFAULT_STATIC_DESIRED_JITTER_BUFFER_FRAMES;
-    }
-    qDebug() << "Static desired jitter buffer frames:" << _streamSettings._staticDesiredJitterBufferFrames;
-    
-    const QString MAX_FRAMES_OVER_DESIRED_JSON_KEY = "max_frames_over_desired";
-    _streamSettings._maxFramesOverDesired = audioGroupObject[MAX_FRAMES_OVER_DESIRED_JSON_KEY].toString().toInt(&ok);
-    if (!ok) {
-        _streamSettings._maxFramesOverDesired = DEFAULT_MAX_FRAMES_OVER_DESIRED;
-    }
-    qDebug() << "Max frames over desired:" << _streamSettings._maxFramesOverDesired;
-    
-    const QString USE_STDEV_FOR_DESIRED_CALC_JSON_KEY = "use_stdev_for_desired_calc";
-    _streamSettings._useStDevForJitterCalc = audioGroupObject[USE_STDEV_FOR_DESIRED_CALC_JSON_KEY].toBool();
-    if (_streamSettings._useStDevForJitterCalc) {
-        qDebug() << "Using Philip's stdev method for jitter calc if dynamic jitter buffers enabled";
-    } else {
-        qDebug() << "Using Fred's max-gap method for jitter calc if dynamic jitter buffers enabled";
-    }
-    
-    const QString WINDOW_STARVE_THRESHOLD_JSON_KEY = "window_starve_threshold";
-    _streamSettings._windowStarveThreshold = audioGroupObject[WINDOW_STARVE_THRESHOLD_JSON_KEY].toString().toInt(&ok);
-    if (!ok) {
-        _streamSettings._windowStarveThreshold = DEFAULT_WINDOW_STARVE_THRESHOLD;
-    }
-    qDebug() << "Window A starve threshold:" << _streamSettings._windowStarveThreshold;
-    
-    const QString WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES_JSON_KEY = "window_seconds_for_desired_calc_on_too_many_starves";
-    _streamSettings._windowSecondsForDesiredCalcOnTooManyStarves = audioGroupObject[WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES_JSON_KEY].toString().toInt(&ok);
-    if (!ok) {
-        _streamSettings._windowSecondsForDesiredCalcOnTooManyStarves = DEFAULT_WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES;
-    }
-    qDebug() << "Window A length:" << _streamSettings._windowSecondsForDesiredCalcOnTooManyStarves << "seconds";
-    
-    const QString WINDOW_SECONDS_FOR_DESIRED_REDUCTION_JSON_KEY = "window_seconds_for_desired_reduction";
-    _streamSettings._windowSecondsForDesiredReduction = audioGroupObject[WINDOW_SECONDS_FOR_DESIRED_REDUCTION_JSON_KEY].toString().toInt(&ok);
-    if (!ok) {
-        _streamSettings._windowSecondsForDesiredReduction = DEFAULT_WINDOW_SECONDS_FOR_DESIRED_REDUCTION;
-    }
-    qDebug() << "Window B length:" << _streamSettings._windowSecondsForDesiredReduction << "seconds";
-    
-    const QString REPETITION_WITH_FADE_JSON_KEY = "repetition_with_fade";
-    _streamSettings._repetitionWithFade = audioGroupObject[REPETITION_WITH_FADE_JSON_KEY].toBool();
-    if (_streamSettings._repetitionWithFade) {
-        qDebug() << "Repetition with fade enabled";
-    } else {
-        qDebug() << "Repetition with fade disabled";
-    }
-    
-    const QString PRINT_STREAM_STATS_JSON_KEY = "print_stream_stats";
-    _printStreamStats = audioGroupObject[PRINT_STREAM_STATS_JSON_KEY].toBool();
-    if (_printStreamStats) {
-        qDebug() << "Stream stats will be printed to stdout";
-    }
-    
-    const QString FILTER_KEY = "enable_filter";
-    if (audioGroupObject[FILTER_KEY].isBool()) {
-        _enableFilter = audioGroupObject[FILTER_KEY].toBool();
-    }
-    if (_enableFilter) {
-        qDebug() << "Filter enabled";
-    }
-    
-    const QString UNATTENUATED_ZONE_KEY = "unattenuated_zone";
-    
-    QString unattenuatedZoneString = audioGroupObject[UNATTENUATED_ZONE_KEY].toString();
-    if (!unattenuatedZoneString.isEmpty()) {
-        QStringList zoneStringList = unattenuatedZoneString.split(',');
+    if (settingsObject.contains(AUDIO_BUFFER_GROUP_KEY)) {
+        QJsonObject audioBufferGroupObject = settingsObject[AUDIO_BUFFER_GROUP_KEY].toObject();
         
-        glm::vec3 sourceCorner(zoneStringList[0].toFloat(), zoneStringList[1].toFloat(), zoneStringList[2].toFloat());
-        glm::vec3 sourceDimensions(zoneStringList[3].toFloat(), zoneStringList[4].toFloat(), zoneStringList[5].toFloat());
+        // check the payload to see if we have asked for dynamicJitterBuffer support
+        const QString DYNAMIC_JITTER_BUFFER_JSON_KEY = "dynamic_jitter_buffer";
+        _streamSettings._dynamicJitterBuffers = audioBufferGroupObject[DYNAMIC_JITTER_BUFFER_JSON_KEY].toBool();
+        if (_streamSettings._dynamicJitterBuffers) {
+            qDebug() << "Enable dynamic jitter buffers.";
+        } else {
+            qDebug() << "Dynamic jitter buffers disabled.";
+        }
         
-        glm::vec3 listenerCorner(zoneStringList[6].toFloat(), zoneStringList[7].toFloat(), zoneStringList[8].toFloat());
-        glm::vec3 listenerDimensions(zoneStringList[9].toFloat(), zoneStringList[10].toFloat(), zoneStringList[11].toFloat());
+        bool ok;
+        const QString DESIRED_JITTER_BUFFER_FRAMES_KEY = "static_desired_jitter_buffer_frames";
+        _streamSettings._staticDesiredJitterBufferFrames = audioBufferGroupObject[DESIRED_JITTER_BUFFER_FRAMES_KEY].toString().toInt(&ok);
+        if (!ok) {
+            _streamSettings._staticDesiredJitterBufferFrames = DEFAULT_STATIC_DESIRED_JITTER_BUFFER_FRAMES;
+        }
+        qDebug() << "Static desired jitter buffer frames:" << _streamSettings._staticDesiredJitterBufferFrames;
         
-        _sourceUnattenuatedZone = new AABox(sourceCorner, sourceDimensions);
-        _listenerUnattenuatedZone = new AABox(listenerCorner, listenerDimensions);
+        const QString MAX_FRAMES_OVER_DESIRED_JSON_KEY = "max_frames_over_desired";
+        _streamSettings._maxFramesOverDesired = audioBufferGroupObject[MAX_FRAMES_OVER_DESIRED_JSON_KEY].toString().toInt(&ok);
+        if (!ok) {
+            _streamSettings._maxFramesOverDesired = DEFAULT_MAX_FRAMES_OVER_DESIRED;
+        }
+        qDebug() << "Max frames over desired:" << _streamSettings._maxFramesOverDesired;
         
-        glm::vec3 sourceCenter = _sourceUnattenuatedZone->calcCenter();
-        glm::vec3 destinationCenter = _listenerUnattenuatedZone->calcCenter();
+        const QString USE_STDEV_FOR_DESIRED_CALC_JSON_KEY = "use_stdev_for_desired_calc";
+        _streamSettings._useStDevForJitterCalc = audioBufferGroupObject[USE_STDEV_FOR_DESIRED_CALC_JSON_KEY].toBool();
+        if (_streamSettings._useStDevForJitterCalc) {
+            qDebug() << "Using Philip's stdev method for jitter calc if dynamic jitter buffers enabled";
+        } else {
+            qDebug() << "Using Fred's max-gap method for jitter calc if dynamic jitter buffers enabled";
+        }
         
-        qDebug() << "There is an unattenuated zone with source center at"
-        << QString("%1, %2, %3").arg(sourceCenter.x).arg(sourceCenter.y).arg(sourceCenter.z);
-        qDebug() << "Buffers inside this zone will not be attenuated inside a box with center at"
-        << QString("%1, %2, %3").arg(destinationCenter.x).arg(destinationCenter.y).arg(destinationCenter.z);
-    }
-    
-    const QString ATTENATION_PER_DOULING_IN_DISTANCE = "attenuation_per_doubling_in_distance";
-    if (audioGroupObject[ATTENATION_PER_DOULING_IN_DISTANCE].isString()) {
-        bool ok = false;
-        float attenuation = audioGroupObject[ATTENATION_PER_DOULING_IN_DISTANCE].toString().toFloat(&ok);
-        if (ok) {
-            _attenuationPerDoublingInDistance = attenuation;
-            qDebug() << "Attenuation per doubling in distance changed to" << _attenuationPerDoublingInDistance;
+        const QString WINDOW_STARVE_THRESHOLD_JSON_KEY = "window_starve_threshold";
+        _streamSettings._windowStarveThreshold = audioBufferGroupObject[WINDOW_STARVE_THRESHOLD_JSON_KEY].toString().toInt(&ok);
+        if (!ok) {
+            _streamSettings._windowStarveThreshold = DEFAULT_WINDOW_STARVE_THRESHOLD;
+        }
+        qDebug() << "Window A starve threshold:" << _streamSettings._windowStarveThreshold;
+        
+        const QString WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES_JSON_KEY = "window_seconds_for_desired_calc_on_too_many_starves";
+        _streamSettings._windowSecondsForDesiredCalcOnTooManyStarves = audioBufferGroupObject[WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES_JSON_KEY].toString().toInt(&ok);
+        if (!ok) {
+            _streamSettings._windowSecondsForDesiredCalcOnTooManyStarves = DEFAULT_WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES;
+        }
+        qDebug() << "Window A length:" << _streamSettings._windowSecondsForDesiredCalcOnTooManyStarves << "seconds";
+        
+        const QString WINDOW_SECONDS_FOR_DESIRED_REDUCTION_JSON_KEY = "window_seconds_for_desired_reduction";
+        _streamSettings._windowSecondsForDesiredReduction = audioBufferGroupObject[WINDOW_SECONDS_FOR_DESIRED_REDUCTION_JSON_KEY].toString().toInt(&ok);
+        if (!ok) {
+            _streamSettings._windowSecondsForDesiredReduction = DEFAULT_WINDOW_SECONDS_FOR_DESIRED_REDUCTION;
+        }
+        qDebug() << "Window B length:" << _streamSettings._windowSecondsForDesiredReduction << "seconds";
+        
+        const QString REPETITION_WITH_FADE_JSON_KEY = "repetition_with_fade";
+        _streamSettings._repetitionWithFade = audioBufferGroupObject[REPETITION_WITH_FADE_JSON_KEY].toBool();
+        if (_streamSettings._repetitionWithFade) {
+            qDebug() << "Repetition with fade enabled";
+        } else {
+            qDebug() << "Repetition with fade disabled";
+        }
+        
+        const QString PRINT_STREAM_STATS_JSON_KEY = "print_stream_stats";
+        _printStreamStats = audioBufferGroupObject[PRINT_STREAM_STATS_JSON_KEY].toBool();
+        if (_printStreamStats) {
+            qDebug() << "Stream stats will be printed to stdout";
         }
     }
     
-    const QString AUDIO_ZONES = "zones";
-    if (audioGroupObject[AUDIO_ZONES].isObject()) {
-        const QJsonObject& zones = audioGroupObject[AUDIO_ZONES].toObject();
+    if (settingsObject.contains(AUDIO_ENV_GROUP_KEY)) {
+        QJsonObject audioEnvGroupObject = settingsObject[AUDIO_ENV_GROUP_KEY].toObject();
         
-        const QString X_RANGE = "x_range";
-        const QString Y_RANGE = "y_range";
-        const QString Z_RANGE = "z_range";
-        foreach (const QString& zone, zones.keys()) {
-            QJsonObject zoneObject = zones[zone].toObject();
+        const QString ATTENATION_PER_DOULING_IN_DISTANCE = "attenuation_per_doubling_in_distance";
+        if (audioEnvGroupObject[ATTENATION_PER_DOULING_IN_DISTANCE].isString()) {
+            bool ok = false;
+            float attenuation = audioEnvGroupObject[ATTENATION_PER_DOULING_IN_DISTANCE].toString().toFloat(&ok);
+            if (ok) {
+                _attenuationPerDoublingInDistance = attenuation;
+                qDebug() << "Attenuation per doubling in distance changed to" << _attenuationPerDoublingInDistance;
+            }
+        }
+        
+        const QString FILTER_KEY = "enable_filter";
+        if (audioEnvGroupObject[FILTER_KEY].isBool()) {
+            _enableFilter = audioEnvGroupObject[FILTER_KEY].toBool();
+        }
+        if (_enableFilter) {
+            qDebug() << "Filter enabled";
+        }
+        
+        const QString AUDIO_ZONES = "zones";
+        if (audioEnvGroupObject[AUDIO_ZONES].isObject()) {
+            const QJsonObject& zones = audioEnvGroupObject[AUDIO_ZONES].toObject();
             
-            if (zoneObject.contains(X_RANGE) && zoneObject.contains(Y_RANGE) && zoneObject.contains(Z_RANGE)) {
-                QStringList xRange = zoneObject.value(X_RANGE).toString().split("-", QString::SkipEmptyParts);
-                QStringList yRange = zoneObject.value(Y_RANGE).toString().split("-", QString::SkipEmptyParts);
-                QStringList zRange = zoneObject.value(Z_RANGE).toString().split("-", QString::SkipEmptyParts);
+            const QString X_RANGE = "x_range";
+            const QString Y_RANGE = "y_range";
+            const QString Z_RANGE = "z_range";
+            foreach (const QString& zone, zones.keys()) {
+                QJsonObject zoneObject = zones[zone].toObject();
                 
-                if (xRange.size() == 2 && yRange.size() == 2 && zRange.size() == 2) {
-                    float xMin, xMax, yMin, yMax, zMin, zMax;
-                    bool ok, allOk = true;
-                    xMin = xRange[0].toFloat(&ok) / (float)TREE_SCALE;
-                    allOk &= ok;
-                    xMax = xRange[1].toFloat(&ok) / (float)TREE_SCALE;
-                    allOk &= ok;
-                    yMin = yRange[0].toFloat(&ok) / (float)TREE_SCALE;
-                    allOk &= ok;
-                    yMax = yRange[1].toFloat(&ok) / (float)TREE_SCALE;
-                    allOk &= ok;
-                    zMin = zRange[0].toFloat(&ok) / (float)TREE_SCALE;
-                    allOk &= ok;
-                    zMax = zRange[1].toFloat(&ok) / (float)TREE_SCALE;
-                    allOk &= ok;
+                if (zoneObject.contains(X_RANGE) && zoneObject.contains(Y_RANGE) && zoneObject.contains(Z_RANGE)) {
+                    QStringList xRange = zoneObject.value(X_RANGE).toString().split("-", QString::SkipEmptyParts);
+                    QStringList yRange = zoneObject.value(Y_RANGE).toString().split("-", QString::SkipEmptyParts);
+                    QStringList zRange = zoneObject.value(Z_RANGE).toString().split("-", QString::SkipEmptyParts);
                     
-                    if (allOk) {
-                        glm::vec3 corner(xMin, yMin, zMin);
-                        glm::vec3 dimension(xMax - xMin, yMax - yMin, zMax - zMin);
-                        AABox zoneAABox(corner, dimension);
-                        _audioZones.insert(zone, zoneAABox);
-                        qDebug() << "Added zone:" << zoneAABox;
+                    if (xRange.size() == 2 && yRange.size() == 2 && zRange.size() == 2) {
+                        float xMin, xMax, yMin, yMax, zMin, zMax;
+                        bool ok, allOk = true;
+                        xMin = xRange[0].toFloat(&ok) / (float)TREE_SCALE;
+                        allOk &= ok;
+                        xMax = xRange[1].toFloat(&ok) / (float)TREE_SCALE;
+                        allOk &= ok;
+                        yMin = yRange[0].toFloat(&ok) / (float)TREE_SCALE;
+                        allOk &= ok;
+                        yMax = yRange[1].toFloat(&ok) / (float)TREE_SCALE;
+                        allOk &= ok;
+                        zMin = zRange[0].toFloat(&ok) / (float)TREE_SCALE;
+                        allOk &= ok;
+                        zMax = zRange[1].toFloat(&ok) / (float)TREE_SCALE;
+                        allOk &= ok;
+                        
+                        if (allOk) {
+                            glm::vec3 corner(xMin, yMin, zMin);
+                            glm::vec3 dimension(xMax - xMin, yMax - yMin, zMax - zMin);
+                            AABox zoneAABox(corner, dimension);
+                            _audioZones.insert(zone, zoneAABox);
+                            qDebug() << "Added zone:" << zoneAABox;
+                        }
                     }
                 }
             }

From b19956b0cadf78a800565f44e3b6f01e555d0533 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 9 Oct 2014 14:46:13 -0700
Subject: [PATCH 07/15] Changed panel names

---
 domain-server/resources/describe-settings.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index e7b9f1ca6c..818ba62370 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -63,7 +63,7 @@
     ]
   },
   {
-    "name": "audio",
+    "name": "audio_env",
     "label": "Audio Environment",
     "assignment-types": [0],
     "settings": [
@@ -143,7 +143,7 @@
     ]
   },
   {
-    "name": "audio_advanced",
+    "name": "audio_buffer",
     "label": "Audio Buffer",
     "assignment-types": [0],
     "settings": [

From 0fa95ba61dde933e1f5146050d90a6a2cf0b793d Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 9 Oct 2014 14:46:32 -0700
Subject: [PATCH 08/15] Removed Unattenuated zones from mixer

---
 assignment-client/src/audio/AudioMixer.cpp    | 29 +++++--------------
 assignment-client/src/audio/AudioMixer.h      |  3 --
 .../src/audio/AudioMixerClientData.cpp        |  8 +----
 .../src/audio/AudioMixerClientData.h          |  2 +-
 libraries/audio/src/PositionalAudioStream.cpp |  3 +-
 libraries/audio/src/PositionalAudioStream.h   |  4 ---
 6 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 49991a02c5..5b162b7c7b 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -90,8 +90,6 @@ AudioMixer::AudioMixer(const QByteArray& packet) :
     _numStatFrames(0),
     _sumListeners(0),
     _sumMixes(0),
-    _sourceUnattenuatedZone(NULL),
-    _listenerUnattenuatedZone(NULL),
     _lastPerSecondCallbackTime(usecTimestampNow()),
     _sendAudioStreamStats(false),
     _datagramsReadPerCallStats(0, READ_DATAGRAMS_STATS_WINDOW_SECONDS),
@@ -103,18 +101,13 @@ AudioMixer::AudioMixer(const QByteArray& packet) :
     // we will soon find a better common home for these audio-related constants
 }
 
-AudioMixer::~AudioMixer() {
-    delete _sourceUnattenuatedZone;
-    delete _listenerUnattenuatedZone;
-}
-
 const float ATTENUATION_BEGINS_AT_DISTANCE = 1.0f;
 const float RADIUS_OF_HEAD = 0.076f;
 
 int AudioMixer::addStreamToMixForListeningNodeWithStream(AudioMixerClientData* listenerNodeData,
-                                                            const QUuid& streamUUID,
-                                                            PositionalAudioStream* streamToAdd,
-                                                            AvatarAudioStream* listeningNodeStream) {
+                                                         const QUuid& streamUUID,
+                                                         PositionalAudioStream* streamToAdd,
+                                                         AvatarAudioStream* listeningNodeStream) {
     // If repetition with fade is enabled:
     // If streamToAdd could not provide a frame (it was starved), then we'll mix its previously-mixed frame
     // This is preferable to not mixing it at all since that's equivalent to inserting silence.
@@ -138,21 +131,19 @@ int AudioMixer::addStreamToMixForListeningNodeWithStream(AudioMixerClientData* l
             return 0;
         }
     }
-
+    
     // at this point, we know streamToAdd's last pop output is valid
-
+    
     // if the frame we're about to mix is silent, bail
     if (streamToAdd->getLastPopOutputLoudness() == 0.0f) {
         return 0;
     }
-
+    
     float bearingRelativeAngleToSource = 0.0f;
     float attenuationCoefficient = 1.0f;
     int numSamplesDelay = 0;
     float weakChannelAmplitudeRatio = 1.0f;
     
-    bool shouldDistanceAttenuate = true;
-    
     //  Is the source that I am mixing my own?
     bool sourceIsSelf = (streamToAdd == listeningNodeStream);
     
@@ -172,10 +163,6 @@ int AudioMixer::addStreamToMixForListeningNodeWithStream(AudioMixerClientData* l
     
     ++_sumMixes;
     
-    if (streamToAdd->getListenerUnattenuatedZone()) {
-        shouldDistanceAttenuate = !streamToAdd->getListenerUnattenuatedZone()->contains(listeningNodeStream->getPosition());
-    }
-    
     if (streamToAdd->getType() == PositionalAudioStream::Injector) {
         attenuationCoefficient *= reinterpret_cast<InjectedAudioStream*>(streamToAdd)->getAttenuationRatio();
         if (showDebug) {
@@ -211,7 +198,7 @@ int AudioMixer::addStreamToMixForListeningNodeWithStream(AudioMixerClientData* l
         attenuationCoefficient *= offAxisCoefficient;
     }
     
-    if (shouldDistanceAttenuate && (distanceBetween >= ATTENUATION_BEGINS_AT_DISTANCE)) {
+    if (distanceBetween >= ATTENUATION_BEGINS_AT_DISTANCE) {
         // calculate the distance coefficient using the distance to this node
         float distanceCoefficient = 1 - (logf(distanceBetween / ATTENUATION_BEGINS_AT_DISTANCE) / logf(2.0f)
                                          * _attenuationPerDoublingInDistance);
@@ -719,7 +706,7 @@ void AudioMixer::run() {
                 // this function will attempt to pop a frame from each audio stream.
                 // a pointer to the popped data is stored as a member in InboundAudioStream.
                 // That's how the popped audio data will be read for mixing (but only if the pop was successful)
-                nodeData->checkBuffersBeforeFrameSend(_sourceUnattenuatedZone, _listenerUnattenuatedZone);
+                nodeData->checkBuffersBeforeFrameSend();
             
                 if (node->getType() == NodeType::Agent && node->getActiveSocket()
                     && nodeData->getAvatarAudioStream()) {
diff --git a/assignment-client/src/audio/AudioMixer.h b/assignment-client/src/audio/AudioMixer.h
index ca1b610051..44cb592f3a 100644
--- a/assignment-client/src/audio/AudioMixer.h
+++ b/assignment-client/src/audio/AudioMixer.h
@@ -29,7 +29,6 @@ class AudioMixer : public ThreadedAssignment {
     Q_OBJECT
 public:
     AudioMixer(const QByteArray& packet);
-    ~AudioMixer();
 public slots:
     /// threaded run of assignment
     void run();
@@ -75,8 +74,6 @@ private:
     int _numStatFrames;
     int _sumListeners;
     int _sumMixes;
-    AABox* _sourceUnattenuatedZone;
-    AABox* _listenerUnattenuatedZone;
     QHash<QString, AABox> _audioZones;
 
     static InboundAudioStream::Settings _streamSettings;
diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp
index 2f60640da3..26178eb2af 100644
--- a/assignment-client/src/audio/AudioMixerClientData.cpp
+++ b/assignment-client/src/audio/AudioMixerClientData.cpp
@@ -106,7 +106,7 @@ int AudioMixerClientData::parseData(const QByteArray& packet) {
     return 0;
 }
 
-void AudioMixerClientData::checkBuffersBeforeFrameSend(AABox* checkSourceZone, AABox* listenerZone) {
+void AudioMixerClientData::checkBuffersBeforeFrameSend() {
     QHash<QUuid, PositionalAudioStream*>::ConstIterator i;
     for (i = _audioStreams.constBegin(); i != _audioStreams.constEnd(); i++) {
         PositionalAudioStream* stream = i.value();
@@ -114,12 +114,6 @@ void AudioMixerClientData::checkBuffersBeforeFrameSend(AABox* checkSourceZone, A
         if (stream->popFrames(1, true) > 0) {
             stream->updateLastPopOutputLoudnessAndTrailingLoudness();
         }
-        
-        if (checkSourceZone && checkSourceZone->contains(stream->getPosition())) {
-            stream->setListenerUnattenuatedZone(listenerZone);
-        } else {
-            stream->setListenerUnattenuatedZone(NULL);
-        }
     }
 }
 
diff --git a/assignment-client/src/audio/AudioMixerClientData.h b/assignment-client/src/audio/AudioMixerClientData.h
index 61d2b54e71..ce43229286 100644
--- a/assignment-client/src/audio/AudioMixerClientData.h
+++ b/assignment-client/src/audio/AudioMixerClientData.h
@@ -42,7 +42,7 @@ public:
     
     int parseData(const QByteArray& packet);
 
-    void checkBuffersBeforeFrameSend(AABox* checkSourceZone, AABox* listenerZone);
+    void checkBuffersBeforeFrameSend();
 
     void removeDeadInjectedStreams();
 
diff --git a/libraries/audio/src/PositionalAudioStream.cpp b/libraries/audio/src/PositionalAudioStream.cpp
index ae30022268..6334ac0efb 100644
--- a/libraries/audio/src/PositionalAudioStream.cpp
+++ b/libraries/audio/src/PositionalAudioStream.cpp
@@ -30,8 +30,7 @@ PositionalAudioStream::PositionalAudioStream(PositionalAudioStream::Type type, b
     _shouldLoopbackForNode(false),
     _isStereo(isStereo),
     _lastPopOutputTrailingLoudness(0.0f),
-    _lastPopOutputLoudness(0.0f),
-    _listenerUnattenuatedZone(NULL)
+    _lastPopOutputLoudness(0.0f)
 {
 }
 
diff --git a/libraries/audio/src/PositionalAudioStream.h b/libraries/audio/src/PositionalAudioStream.h
index 2b615a575b..6ac189352b 100644
--- a/libraries/audio/src/PositionalAudioStream.h
+++ b/libraries/audio/src/PositionalAudioStream.h
@@ -42,9 +42,6 @@ public:
     PositionalAudioStream::Type getType() const { return _type; }
     const glm::vec3& getPosition() const { return _position; }
     const glm::quat& getOrientation() const { return _orientation; }
-    AABox* getListenerUnattenuatedZone() const { return _listenerUnattenuatedZone; }
-
-    void setListenerUnattenuatedZone(AABox* listenerUnattenuatedZone) { _listenerUnattenuatedZone = listenerUnattenuatedZone; }
 
 protected:
     // disallow copying of PositionalAudioStream objects
@@ -63,7 +60,6 @@ protected:
 
     float _lastPopOutputTrailingLoudness;
     float _lastPopOutputLoudness;
-    AABox* _listenerUnattenuatedZone;
 };
 
 #endif // hifi_PositionalAudioStream_h

From 90c5c7f43c23fd3ac4b76175cc2edffe6b41f4c1 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 9 Oct 2014 16:41:48 -0700
Subject: [PATCH 09/15] Attenuation coefficients parsing

---
 assignment-client/src/audio/AudioMixer.cpp | 38 +++++++++++++++++++++-
 assignment-client/src/audio/AudioMixer.h   |  1 +
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 5b162b7c7b..c08892e26b 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -989,7 +989,41 @@ void AudioMixer::parseSettingsObject(const QJsonObject &settingsObject) {
                             glm::vec3 dimension(xMax - xMin, yMax - yMin, zMax - zMin);
                             AABox zoneAABox(corner, dimension);
                             _audioZones.insert(zone, zoneAABox);
-                            qDebug() << "Added zone:" << zoneAABox;
+                            qDebug() << "Added zone:" << zone << zoneAABox;
+                        }
+                    }
+                }
+            }
+        }
+        
+        const QString ATTENUATION_COEFFICIENTS = "attenuation_coefficients";
+        if (audioEnvGroupObject[ATTENUATION_COEFFICIENTS].isArray()) {
+            const QJsonArray& coefficients = audioEnvGroupObject[ATTENUATION_COEFFICIENTS].toArray();
+            
+            const QString SOURCE = "source";
+            const QString LISTENER = "listener";
+            const QString COEFFICIENT = "coefficient";
+            for (int i = 0; i < coefficients.count(); ++i) {
+                QJsonObject coefficientObject = coefficients[i].toObject();
+                
+                if (coefficientObject.contains(SOURCE) &&
+                    coefficientObject.contains(LISTENER) &&
+                    coefficientObject.contains(COEFFICIENT)) {
+                    
+                    bool ok;
+                    QString source = coefficientObject.value(SOURCE).toString();
+                    QString listener = coefficientObject.value(LISTENER).toString();
+                    float coefficient = coefficientObject.value(COEFFICIENT).toString().toFloat(&ok);
+                    
+                    if (ok && coefficient >= 0.0f && coefficient <= 1.0f &&
+                        _audioZones.contains(source) && _audioZones.contains(listener)) {
+                        
+                        if (!_attenuationCoefficients.contains(source)) {
+                            _attenuationCoefficients.insert(source, QHash<QString, float>());
+                        }
+                        if (!_attenuationCoefficients[source].contains(listener)) {
+                            _attenuationCoefficients[source].insert(listener, coefficient);
+                            qDebug() << "Added Coefficient:" << source << listener << coefficient;
                         }
                     }
                 }
@@ -997,3 +1031,5 @@ void AudioMixer::parseSettingsObject(const QJsonObject &settingsObject) {
         }
     }
 }
+
+
diff --git a/assignment-client/src/audio/AudioMixer.h b/assignment-client/src/audio/AudioMixer.h
index 44cb592f3a..7f07c846a4 100644
--- a/assignment-client/src/audio/AudioMixer.h
+++ b/assignment-client/src/audio/AudioMixer.h
@@ -75,6 +75,7 @@ private:
     int _sumListeners;
     int _sumMixes;
     QHash<QString, AABox> _audioZones;
+    QHash<QString, QHash<QString, float> > _attenuationCoefficients;
 
     static InboundAudioStream::Settings _streamSettings;
 

From 03555174ef315fa0647c986925dcb8df07ed4d4d Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 9 Oct 2014 18:54:21 -0700
Subject: [PATCH 10/15] Remove TREE_SCALE factor _ update attenuation

---
 assignment-client/src/audio/AudioMixer.cpp | 32 +++++++++++++++-------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index c08892e26b..161fe90da4 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -197,11 +197,22 @@ int AudioMixer::addStreamToMixForListeningNodeWithStream(AudioMixerClientData* l
         
         attenuationCoefficient *= offAxisCoefficient;
     }
+   
+    float attenuationPerDoublingInDistance = _attenuationPerDoublingInDistance;
+    foreach (const QString source, _attenuationCoefficients.keys()) {
+        if (_audioZones[source].contains(streamToAdd->getPosition())) {
+            foreach (const QString listener, _attenuationCoefficients[source].keys()) {
+                if (_audioZones[listener].contains(listeningNodeStream->getPosition())) {
+                    attenuationCoefficient = _attenuationCoefficients[source][listener];
+                }
+            }
+        }
+    }
     
     if (distanceBetween >= ATTENUATION_BEGINS_AT_DISTANCE) {
         // calculate the distance coefficient using the distance to this node
         float distanceCoefficient = 1 - (logf(distanceBetween / ATTENUATION_BEGINS_AT_DISTANCE) / logf(2.0f)
-                                         * _attenuationPerDoublingInDistance);
+                                         * attenuationPerDoublingInDistance);
         
         if (distanceCoefficient < 0) {
             distanceCoefficient = 0;
@@ -971,25 +982,26 @@ void AudioMixer::parseSettingsObject(const QJsonObject &settingsObject) {
                     if (xRange.size() == 2 && yRange.size() == 2 && zRange.size() == 2) {
                         float xMin, xMax, yMin, yMax, zMin, zMax;
                         bool ok, allOk = true;
-                        xMin = xRange[0].toFloat(&ok) / (float)TREE_SCALE;
+                        xMin = xRange[0].toFloat(&ok);
                         allOk &= ok;
-                        xMax = xRange[1].toFloat(&ok) / (float)TREE_SCALE;
+                        xMax = xRange[1].toFloat(&ok);
                         allOk &= ok;
-                        yMin = yRange[0].toFloat(&ok) / (float)TREE_SCALE;
+                        yMin = yRange[0].toFloat(&ok);
                         allOk &= ok;
-                        yMax = yRange[1].toFloat(&ok) / (float)TREE_SCALE;
+                        yMax = yRange[1].toFloat(&ok);
                         allOk &= ok;
-                        zMin = zRange[0].toFloat(&ok) / (float)TREE_SCALE;
+                        zMin = zRange[0].toFloat(&ok);
                         allOk &= ok;
-                        zMax = zRange[1].toFloat(&ok) / (float)TREE_SCALE;
+                        zMax = zRange[1].toFloat(&ok);
                         allOk &= ok;
                         
                         if (allOk) {
                             glm::vec3 corner(xMin, yMin, zMin);
-                            glm::vec3 dimension(xMax - xMin, yMax - yMin, zMax - zMin);
-                            AABox zoneAABox(corner, dimension);
+                            glm::vec3 dimensions(xMax - xMin, yMax - yMin, zMax - zMin);
+                            AABox zoneAABox(corner, dimensions);
                             _audioZones.insert(zone, zoneAABox);
-                            qDebug() << "Added zone:" << zone << zoneAABox;
+                            qDebug() << "Added zone:" << zone << "(corner:" << corner
+                                     << ", dimensions:" << dimensions << ")";
                         }
                     }
                 }

From 64b3d461fe1b994869e5a52b080485334f0f13a5 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 9 Oct 2014 15:58:26 -0700
Subject: [PATCH 11/15] fix for delete of object table row

---
 domain-server/resources/web/js/settings.js | 27 ++++++++++++----------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index b21ecc269f..229416aacf 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -478,21 +478,24 @@ function deleteTableRow(delete_glyphicon) {
   if (!isArray) {
     // this is a hash row, so we empty it but leave the hidden input blank so it is cleared when we save
     row.empty()
-    row.html("<input type='hidden' class='form-control' name='" + table.attr("name") + "' data-changed='true' value=''>");
-  } else if (table.find('.' + Settings.DATA_ROW_CLASS).length > 1) {
-    updateDataChangedForSiblingRows(row)
-    
-    // this isn't the last row - we can just remove it
-    row.remove()
+    row.html("<input type='hidden' class='form-control' name='" 
+      + row.attr('name') + "' data-changed='true' value=''>");
   } else {
-    // this is the last row, we can't remove it completely since we need to post an empty array
-    row.empty()
+    if (table.find('.' + Settings.DATA_ROW_CLASS).length) {
+      updateDataChangedForSiblingRows(row)
     
-    row.removeClass(Settings.DATA_ROW_CLASS).removeClass(Settings.NEW_ROW_CLASS)
-    row.addClass('empty-array-row')
+      // this isn't the last row - we can just remove it
+      row.remove()
+    } else {
+      // this is the last row, we can't remove it completely since we need to post an empty array
+      row.empty()
     
-    row.html("<input type='hidden' class='form-control' name='" + table.attr("name").replace('[]', '') 
-      + "' data-changed='true' value=''>");
+      row.removeClass(Settings.DATA_ROW_CLASS).removeClass(Settings.NEW_ROW_CLASS)
+      row.addClass('empty-array-row')
+    
+      row.html("<input type='hidden' class='form-control' name='" + table.attr("name").replace('[]', '') 
+        + "' data-changed='true' value=''>");
+    }
   }
   
   // we need to fire a change event on one of the remaining inputs so that the sidebar badge is updated

From 0aafd23c7fa145a36b7dc76f0345d27ba58b50c7 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 9 Oct 2014 22:55:27 -0700
Subject: [PATCH 12/15] CR

---
 assignment-client/src/audio/AudioMixer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 161fe90da4..6c6b2cf023 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -199,9 +199,9 @@ int AudioMixer::addStreamToMixForListeningNodeWithStream(AudioMixerClientData* l
     }
    
     float attenuationPerDoublingInDistance = _attenuationPerDoublingInDistance;
-    foreach (const QString source, _attenuationCoefficients.keys()) {
+    foreach (const QString& source, _attenuationCoefficients.keys()) {
         if (_audioZones[source].contains(streamToAdd->getPosition())) {
-            foreach (const QString listener, _attenuationCoefficients[source].keys()) {
+            foreach (const QString& listener, _attenuationCoefficients[source].keys()) {
                 if (_audioZones[listener].contains(listeningNodeStream->getPosition())) {
                     attenuationCoefficient = _attenuationCoefficients[source][listener];
                 }

From 7e8915fed83cc2f2f5026ec9b18d7f41b97859a2 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 10 Oct 2014 10:08:22 -0700
Subject: [PATCH 13/15] Break out of double loop

---
 assignment-client/src/audio/AudioMixer.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 6c6b2cf023..bf2b1370f8 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -198,15 +198,23 @@ int AudioMixer::addStreamToMixForListeningNodeWithStream(AudioMixerClientData* l
         attenuationCoefficient *= offAxisCoefficient;
     }
    
+    bool wantBreak = false;
     float attenuationPerDoublingInDistance = _attenuationPerDoublingInDistance;
     foreach (const QString& source, _attenuationCoefficients.keys()) {
         if (_audioZones[source].contains(streamToAdd->getPosition())) {
             foreach (const QString& listener, _attenuationCoefficients[source].keys()) {
                 if (_audioZones[listener].contains(listeningNodeStream->getPosition())) {
                     attenuationCoefficient = _attenuationCoefficients[source][listener];
+                    wantBreak = true;
+                }
+                if (wantBreak) {
+                    break;
                 }
             }
         }
+        if (wantBreak) {
+            break;
+        }
     }
     
     if (distanceBetween >= ATTENUATION_BEGINS_AT_DISTANCE) {

From d8c60a78bbec615895b6b7edcb4d3046fa7329a3 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 10 Oct 2014 15:32:29 -0700
Subject: [PATCH 14/15] Fix stupid variable swap

---
 assignment-client/src/audio/AudioMixer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index bf2b1370f8..e25f517967 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -204,7 +204,7 @@ int AudioMixer::addStreamToMixForListeningNodeWithStream(AudioMixerClientData* l
         if (_audioZones[source].contains(streamToAdd->getPosition())) {
             foreach (const QString& listener, _attenuationCoefficients[source].keys()) {
                 if (_audioZones[listener].contains(listeningNodeStream->getPosition())) {
-                    attenuationCoefficient = _attenuationCoefficients[source][listener];
+                    attenuationPerDoublingInDistance = _attenuationCoefficients[source][listener];
                     wantBreak = true;
                 }
                 if (wantBreak) {

From 6bde4b832479443b407670f38fa7f1f12c2f7d4a Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 13 Oct 2014 10:24:01 -0700
Subject: [PATCH 15/15] Move break

---
 assignment-client/src/audio/AudioMixer.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index e25f517967..42ea8a7341 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -206,8 +206,6 @@ int AudioMixer::addStreamToMixForListeningNodeWithStream(AudioMixerClientData* l
                 if (_audioZones[listener].contains(listeningNodeStream->getPosition())) {
                     attenuationPerDoublingInDistance = _attenuationCoefficients[source][listener];
                     wantBreak = true;
-                }
-                if (wantBreak) {
                     break;
                 }
             }