From 2fe24b39dbe4f1c3d60d81f549aa5e6dba614eb0 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 25 Sep 2019 07:50:56 +1200
Subject: [PATCH] Code review

---
 assignment-client/src/Agent.cpp          | 22 ++++++++++------------
 libraries/recording/src/recording/Deck.h |  2 +-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index e68262f712..ee1e21c837 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -442,21 +442,19 @@ void Agent::executeScript() {
 
             QByteArray audio(frame->data);
 
+            int16_t* samples = reinterpret_cast<int16_t*>(audio.data());
+            int numSamples = AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL;
+
             auto volume = player->getVolume();
-            if (volume != 1.0f || _isNoiseGateEnabled) {
-                int16_t* samples = reinterpret_cast<int16_t*>(audio.data());
-                int numSamples = AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL;
-
-                if (volume != 1.0f) {
-                    int32_t fract = (int32_t)(volume * 65536.0f);   // Q16
-                    for (int i = 0; i < numSamples; i++) {
-                        samples[i] = (fract * (int32_t)samples[i]) >> 16;
-                    }
+            if (volume >= 0.0f && volume < 1.0f) {
+                int32_t fract = (int32_t)(volume * (float)(1 << 16));   // Q16
+                for (int i = 0; i < numSamples; i++) {
+                    samples[i] = (fract * (int32_t)samples[i]) >> 16;
                 }
+            }
 
-                if (_isNoiseGateEnabled) {
-                    _audioGate.render(samples, samples, numSamples);
-                }
+            if (_isNoiseGateEnabled) {
+                _audioGate.render(samples, samples, numSamples);
             }
 
             computeLoudness(&audio, scriptedAvatar);
diff --git a/libraries/recording/src/recording/Deck.h b/libraries/recording/src/recording/Deck.h
index 12e2dd4b16..6dce3a445b 100644
--- a/libraries/recording/src/recording/Deck.h
+++ b/libraries/recording/src/recording/Deck.h
@@ -57,7 +57,7 @@ public:
     float position() const;
     void seek(float position);
 
-    float getVolume() { return _volume; }
+    float getVolume() const { return _volume; }
     void setVolume(float volume);
 
 signals: