From c6ca984782348f4c5a5f9cacbe3cf2d53cf4ca69 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Thu, 24 Mar 2016 12:59:52 -0700
Subject: [PATCH] Fix Reverb Zone settings to work correctly with new reverb.

---
 assignment-client/src/audio/AudioMixer.cpp     | 15 ++++++++-------
 domain-server/resources/describe-settings.json |  6 +++---
 libraries/audio-client/src/AudioClient.cpp     |  8 ++++----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 779307c19d..fda528473f 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -370,13 +370,14 @@ void AudioMixer::sendAudioEnvironmentPacket(SharedNodePointer node) {
             wetLevel = _zoneReverbSettings[i].wetLevel;
 
             // Modulate wet level with distance to wall
-            float MIN_ATTENUATION_DISTANCE = 2.0f;
-            float MAX_ATTENUATION = -12; // dB
-            glm::vec3 distanceToWalls = (box.getDimensions() / 2.0f) - glm::abs(streamPosition - box.calcCenter());
-            float distanceToClosestWall = glm::min(distanceToWalls.x, distanceToWalls.z);
-            if (distanceToClosestWall < MIN_ATTENUATION_DISTANCE) {
-                wetLevel += MAX_ATTENUATION * (1.0f - distanceToClosestWall / MIN_ATTENUATION_DISTANCE);
-            }
+            //float MIN_ATTENUATION_DISTANCE = 2.0f;
+            //float MAX_ATTENUATION = -12; // dB
+            //glm::vec3 distanceToWalls = (box.getDimensions() / 2.0f) - glm::abs(streamPosition - box.calcCenter());
+            //float distanceToClosestWall = glm::min(distanceToWalls.x, distanceToWalls.z);
+            //if (distanceToClosestWall < MIN_ATTENUATION_DISTANCE) {
+            //    wetLevel += MAX_ATTENUATION * (1.0f - distanceToClosestWall / MIN_ATTENUATION_DISTANCE);
+            //}
+
             break;
         }
     }
diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 80ee32efa1..44a1796a8d 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -308,7 +308,7 @@
           "name": "reverb",
           "type": "table",
           "label": "Reverb Settings",
-          "help": "In this table you can set reverb levels for audio zones.  For a medium-sized (e.g., 100 square meter) meeting room, try a decay time of around 1.5 seconds and a wet level of -10 db. For an airplane hangar or cathedral, try a decay time of 4 seconds and a wet level of -5 db.",
+          "help": "In this table you can set reverb levels for audio zones.  For a medium-sized (e.g., 100 square meter) meeting room, try a decay time of around 1.5 seconds and a wet/dry mix of 25%. For an airplane hangar or cathedral, try a decay time of 4 seconds and a wet/dry mix of 50%.",
           "numbered": true,
           "columns": [
             {
@@ -325,9 +325,9 @@
             },
             {
               "name": "wet_level",
-              "label": "Wet Level",
+              "label": "Wet/Dry Mix",
               "can_set": true,
-              "placeholder": "(in db)"
+              "placeholder": "(in percent)"
             }
           ]
         }
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 4d44a771f7..7e01196dc7 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -565,10 +565,10 @@ void AudioClient::updateReverbOptions() {
             _zoneReverbOptions.setReverbTime(_receivedAudioStream.getRevebTime());
             reverbChanged = true;
         }
-        //if (_zoneReverbOptions.getWetLevel() != _receivedAudioStream.getWetLevel()) {
-        //    _zoneReverbOptions.setWetLevel(_receivedAudioStream.getWetLevel());
-        //    reverbChanged = true;
-        //}
+        if (_zoneReverbOptions.getWetDryMix() != _receivedAudioStream.getWetLevel()) {
+            _zoneReverbOptions.setWetDryMix(_receivedAudioStream.getWetLevel());
+            reverbChanged = true;
+        }
 
         if (_reverbOptions != &_zoneReverbOptions) {
             _reverbOptions = &_zoneReverbOptions;