From 7311c3ac06aa3e1425c169afc22f0d0c2842900e Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Thu, 21 Mar 2019 11:51:49 -0700
Subject: [PATCH] Move the new audio volume API from Users scripting interface
 to Audio scripting interface

---
 interface/src/scripting/Audio.cpp             | 36 ++++++++++++++++---
 interface/src/scripting/Audio.h               | 30 ++++++++++++++++
 .../src/UsersScriptingInterface.cpp           |  9 -----
 .../src/UsersScriptingInterface.h             | 15 --------
 4 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/interface/src/scripting/Audio.cpp b/interface/src/scripting/Audio.cpp
index bf43db3044..e0474b7bba 100644
--- a/interface/src/scripting/Audio.cpp
+++ b/interface/src/scripting/Audio.cpp
@@ -374,6 +374,18 @@ void Audio::handlePushedToTalk(bool enabled) {
     }
 }
 
+void Audio::setInputDevice(const QAudioDeviceInfo& device, bool isHMD) {
+    withWriteLock([&] {
+        _devices.chooseInputDevice(device, isHMD);
+    });
+}
+
+void Audio::setOutputDevice(const QAudioDeviceInfo& device, bool isHMD) {
+    withWriteLock([&] {
+        _devices.chooseOutputDevice(device, isHMD);
+    });
+}
+
 void Audio::setReverb(bool enable) {
     withWriteLock([&] {
         DependencyManager::get<AudioClient>()->setReverb(enable);
@@ -386,14 +398,28 @@ void Audio::setReverbOptions(const AudioEffectOptions* options) {
     });
 }
 
-void Audio::setInputDevice(const QAudioDeviceInfo& device, bool isHMD) {
+void Audio::setAvatarGain(float gain) {
     withWriteLock([&] {
-        _devices.chooseInputDevice(device, isHMD);
+        // ask the NodeList to set the master avatar gain
+        DependencyManager::get<NodeList>()->setAvatarGain("", gain);
     });
 }
 
-void Audio::setOutputDevice(const QAudioDeviceInfo& device, bool isHMD) {
-    withWriteLock([&] {
-        _devices.chooseOutputDevice(device, isHMD);
+float Audio::getAvatarGain() {
+    return resultWithReadLock<float>([&] {
+        return DependencyManager::get<NodeList>()->getAvatarGain("");
+    });
+}
+
+void Audio::setInjectorGain(float gain) {
+    withWriteLock([&] {
+        // ask the NodeList to set the audio injector gain
+        DependencyManager::get<NodeList>()->setInjectorGain(gain);
+    });
+}
+
+float Audio::getInjectorGain() {
+    return resultWithReadLock<float>([&] {
+        return DependencyManager::get<NodeList>()->getInjectorGain();
     });
 }
diff --git a/interface/src/scripting/Audio.h b/interface/src/scripting/Audio.h
index 9ee230fc29..14a75d5ffe 100644
--- a/interface/src/scripting/Audio.h
+++ b/interface/src/scripting/Audio.h
@@ -170,6 +170,36 @@ public:
      */
     Q_INVOKABLE void setReverbOptions(const AudioEffectOptions* options);
 
+    /**jsdoc
+     * Sets the master avatar gain at the server.
+     * Units are Decibels (dB)
+     * @function Audio.setAvatarGain
+     * @param {number} gain (in dB)
+    */
+    Q_INVOKABLE void setAvatarGain(float gain);
+
+    /**jsdoc
+     * Gets the master avatar gain at the server.
+     * @function Audio.getAvatarGain
+     * @returns {number} gain (in dB)
+    */
+    Q_INVOKABLE float getAvatarGain();
+
+    /**jsdoc
+     * Sets the audio injector gain at the server.
+     * Units are Decibels (dB)
+     * @function Audio.setInjectorGain
+     * @param {number} gain (in dB)
+    */
+    Q_INVOKABLE void setInjectorGain(float gain);
+
+    /**jsdoc
+     * Gets the audio injector gain at the server.
+     * @function Audio.getInjectorGain
+     * @returns {number} gain (in dB)
+    */
+    Q_INVOKABLE float getInjectorGain();
+
     /**jsdoc
      * Starts making an audio recording of the audio being played in-world (i.e., not local-only audio) to a file in WAV format.
      * @function Audio.startRecording
diff --git a/libraries/script-engine/src/UsersScriptingInterface.cpp b/libraries/script-engine/src/UsersScriptingInterface.cpp
index a0593d3ff8..fef11c12e9 100644
--- a/libraries/script-engine/src/UsersScriptingInterface.cpp
+++ b/libraries/script-engine/src/UsersScriptingInterface.cpp
@@ -51,15 +51,6 @@ float UsersScriptingInterface::getAvatarGain(const QUuid& nodeID) {
     return DependencyManager::get<NodeList>()->getAvatarGain(nodeID);
 }
 
-void UsersScriptingInterface::setInjectorGain(float gain) {
-    // ask the NodeList to set the audio injector gain
-    DependencyManager::get<NodeList>()->setInjectorGain(gain);
-}
-
-float UsersScriptingInterface::getInjectorGain() {
-    return DependencyManager::get<NodeList>()->getInjectorGain();
-}
-
 void UsersScriptingInterface::kick(const QUuid& nodeID) {
     // ask the NodeList to kick the user with the given session ID
     DependencyManager::get<NodeList>()->kickNodeBySessionID(nodeID);
diff --git a/libraries/script-engine/src/UsersScriptingInterface.h b/libraries/script-engine/src/UsersScriptingInterface.h
index 17a84248a1..57de205066 100644
--- a/libraries/script-engine/src/UsersScriptingInterface.h
+++ b/libraries/script-engine/src/UsersScriptingInterface.h
@@ -90,21 +90,6 @@ public slots:
     */
     float getAvatarGain(const QUuid& nodeID);
 
-    /**jsdoc
-     * Sets the audio injector gain at the server.
-     * Units are Decibels (dB)
-     * @function Users.setInjectorGain
-     * @param {number} gain (in dB)
-    */
-    void setInjectorGain(float gain);
-
-    /**jsdoc
-     * Gets the audio injector gain at the server.
-     * @function Users.getInjectorGain
-     * @returns {number} gain (in dB)
-    */
-    float getInjectorGain();
-
     /**jsdoc
      * Kick/ban another user. Removes them from the server and prevents them from returning. Bans by either user name (if 
      * available) or machine fingerprint otherwise. This will only do anything if you're an admin of the domain you're in.