Initial implementation (deadlocks still occurring in Audio.cpp)

interface/resources/qml/hifi/audio/Audio.qml

@@ -152,6 +152,25 @@ Rectangle {
                         checked = Qt.binding(function() { return AudioScriptingInterface.noiseReduction; }); // restore binding
                     }
                 }
+                AudioControls.CheckBox {
+                    spacing: muteMic.spacing
+                    text: qsTr("Push To Talk");
+                    checked: isVR ? AudioScriptingInterface.pushToTalkHMD : AudioScriptingInterface.pushToTalkDesktop;
+                    onClicked: {
+                        if (isVR) {
+                            AudioScriptingInterface.pushToTalkHMD = checked;
+                        } else {
+                            AudioScriptingInterface.pushToTalkDesktop = checked;
+                        }
+                        checked = Qt.binding(function() {
+                            if (isVR) {
+                                return AudioScriptingInterface.pushToTalkHMD;
+                            } else {
+                                return AudioScriptingInterface.pushToTalkDesktop;
+                            }
+                        }); // restore binding
+                    }
+                }
                 AudioControls.CheckBox {
                     spacing: muteMic.spacing
                     text: qsTr("Show audio level meter");

interface/resources/qml/hifi/audio/MicBar.qml

@@ -19,13 +19,13 @@ Rectangle {
     HifiConstants { id: hifi; }
 
     readonly property var level: AudioScriptingInterface.inputLevel;
-    
+
     property bool gated: false;
     Component.onCompleted: {
         AudioScriptingInterface.noiseGateOpened.connect(function() { gated = false; });
         AudioScriptingInterface.noiseGateClosed.connect(function() { gated = true; });
     }
-        
+
     property bool standalone: false;
     property var dragTarget: null;
 
@@ -138,7 +138,7 @@ Rectangle {
     Item {
         id: status;
 
-        readonly property string color: AudioScriptingInterface.muted ? colors.muted : colors.unmuted;
+        readonly property string color: (AudioScriptingInterface.pushingToTalk && AudioScriptingInterface.muted) ? hifi.colors.blueHighlight : AudioScriptingInterface.muted ? colors.muted : colors.unmuted;
 
         visible: (AudioScriptingInterface.pushToTalk && !AudioScriptingInterface.pushingToTalk) || AudioScriptingInterface.muted;
 
@@ -235,12 +235,12 @@ Rectangle {
                 }
             }
         }
-        
+
         Rectangle {
             id: gatedIndicator;
             visible: gated && !AudioScriptingInterface.clipping
-            
+
-            radius: 4;     
+            radius: 4;
             width: 2 * radius;
             height: 2 * radius;
             color: "#0080FF";
@@ -249,12 +249,12 @@ Rectangle {
                 verticalCenter: parent.verticalCenter;
             }
         }
-        
+
         Rectangle {
             id: clippingIndicator;
             visible: AudioScriptingInterface.clipping
-            
+
-            radius: 4;     
+            radius: 4;
             width: 2 * radius;
             height: 2 * radius;
             color: colors.red;

interface/src/scripting/Audio.cpp

@@ -231,6 +231,26 @@ void Audio::loadData() {
     _pttHMD = _pttHMDSetting.get();
 }
 
+bool Audio::getPTTHMD() const {
+    return resultWithReadLock<bool>([&] {
+        return _pttHMD;
+    });
+}
+
+void Audio::saveData() {
+    _desktopMutedSetting.set(getMutedDesktop());
+    _hmdMutedSetting.set(getMutedHMD());
+    _pttDesktopSetting.set(getPTTDesktop());
+    _pttHMDSetting.set(getPTTHMD());
+}
+
+void Audio::loadData() {
+    _desktopMuted = _desktopMutedSetting.get();
+    _hmdMuted = _hmdMutedSetting.get();
+    _pttDesktop = _pttDesktopSetting.get();
+    _pttHMD = _pttHMDSetting.get();
+}
+
 bool Audio::noiseReductionEnabled() const {
     return resultWithReadLock<bool>([&] {
         return _enableNoiseReduction;

interface/src/scripting/Audio.h

@@ -41,16 +41,16 @@ class Audio : public AudioScriptingInterface, protected ReadWriteLockable {
      * @hifi-assignment-client
      *
      * @property {boolean} muted - <code>true</code> if the audio input is muted, otherwise <code>false</code>.
-     * @property {boolean} noiseReduction - <code>true</code> if noise reduction is enabled, otherwise <code>false</code>. When 
+     * @property {boolean} noiseReduction - <code>true</code> if noise reduction is enabled, otherwise <code>false</code>. When
-     *     enabled, the input audio signal is blocked (fully attenuated) when it falls below an adaptive threshold set just 
+     *     enabled, the input audio signal is blocked (fully attenuated) when it falls below an adaptive threshold set just
      *     above the noise floor.
-     * @property {number} inputLevel - The loudness of the audio input, range <code>0.0</code> (no sound) &ndash; 
+     * @property {number} inputLevel - The loudness of the audio input, range <code>0.0</code> (no sound) &ndash;
      *     <code>1.0</code> (the onset of clipping). <em>Read-only.</em>
      * @property {boolean} clipping - <code>true</code> if the audio input is clipping, otherwise <code>false</code>.
-     * @property {number} inputVolume - Adjusts the volume of the input audio; range <code>0.0</code> &ndash; <code>1.0</code>. 
+     * @property {number} inputVolume - Adjusts the volume of the input audio; range <code>0.0</code> &ndash; <code>1.0</code>.
-     *     If set to a value, the resulting value depends on the input device: for example, the volume can't be changed on some 
+     *     If set to a value, the resulting value depends on the input device: for example, the volume can't be changed on some
      *     devices, and others might only support values of <code>0.0</code> and <code>1.0</code>.
-     * @property {boolean} isStereoInput - <code>true</code> if the input audio is being used in stereo, otherwise 
+     * @property {boolean} isStereoInput - <code>true</code> if the input audio is being used in stereo, otherwise
      *     <code>false</code>. Some devices do not support stereo, in which case the value is always <code>false</code>.
      * @property {string} context - The current context of the audio: either <code>"Desktop"</code> or <code>"HMD"</code>.
      *     <em>Read-only.</em>
@@ -115,7 +115,7 @@ public:
     /**jsdoc
      * @function Audio.setInputDevice
      * @param {object} device
-     * @param {boolean} isHMD 
+     * @param {boolean} isHMD
      * @deprecated This function is deprecated and will be removed.
      */
     Q_INVOKABLE void setInputDevice(const QAudioDeviceInfo& device, bool isHMD);
@@ -129,8 +129,8 @@ public:
     Q_INVOKABLE void setOutputDevice(const QAudioDeviceInfo& device, bool isHMD);
 
     /**jsdoc
-     * Enable or disable reverberation. Reverberation is done by the client, on the post-mix audio. The reverberation options 
+     * Enable or disable reverberation. Reverberation is done by the client, on the post-mix audio. The reverberation options
-     * come from either the domain's audio zone if used &mdash; configured on the server &mdash; or as scripted by 
+     * come from either the domain's audio zone if used &mdash; configured on the server &mdash; or as scripted by
      * {@link Audio.setReverbOptions|setReverbOptions}.
      * @function Audio.setReverb
      * @param {boolean} enable - <code>true</code> to enable reverberation, <code>false</code> to disable.
@@ -140,13 +140,13 @@ public:
      * var injectorOptions = {
      *     position: MyAvatar.position
      * };
-     * 
+     *
      * Script.setTimeout(function () {
      *     print("Reverb OFF");
      *     Audio.setReverb(false);
      *     injector = Audio.playSound(sound, injectorOptions);
      * }, 1000);
-     * 
+     *
      * Script.setTimeout(function () {
      *     var reverbOptions = new AudioEffectOptions();
      *     reverbOptions.roomSize = 100;
@@ -154,26 +154,26 @@ public:
      *     print("Reverb ON");
      *     Audio.setReverb(true);
      * }, 4000);
-     * 
+     *
      * Script.setTimeout(function () {
      *     print("Reverb OFF");
      *     Audio.setReverb(false);
      * }, 8000);     */
     Q_INVOKABLE void setReverb(bool enable);
-    
+
     /**jsdoc
      * Configure reverberation options. Use {@link Audio.setReverb|setReverb} to enable or disable reverberation.
      * @function Audio.setReverbOptions
      * @param {AudioEffectOptions} options - The reverberation options.
      */
     Q_INVOKABLE void setReverbOptions(const AudioEffectOptions* options);
-   
+
     /**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
-     * @param {string} filename - The path and name of the file to make the recording in. Should have a <code>.wav</code> 
+     * @param {string} filename - The path and name of the file to make the recording in. Should have a <code>.wav</code>
      *     extension. The file is overwritten if it already exists.
-     * @returns {boolean} <code>true</code> if the specified file could be opened and audio recording has started, otherwise 
+     * @returns {boolean} <code>true</code> if the specified file could be opened and audio recording has started, otherwise
      *     <code>false</code>.
      * @example <caption>Make a 10 second audio recording.</caption>
      * var filename = File.getTempDir() + "/audio.wav";
@@ -182,13 +182,13 @@ public:
      *         Audio.stopRecording();
      *         print("Audio recording made in: " + filename);
      *     }, 10000);
-     * 
+     *
      * } else {
      *     print("Could not make an audio recording in: " + filename);
      * }
      */
     Q_INVOKABLE bool startRecording(const QString& filename);
-    
+
     /**jsdoc
      * Finish making an audio recording started with {@link Audio.startRecording|startRecording}.
      * @function Audio.stopRecording
@@ -222,7 +222,7 @@ signals:
      * });
      */
     void mutedChanged(bool isMuted);
-    
+
     /**jsdoc
     * Triggered when desktop audio input is muted or unmuted.
     * @function Audio.desktopMutedChanged
@@ -274,9 +274,9 @@ signals:
     /**jsdoc
      * Triggered when the input audio volume changes.
      * @function Audio.inputVolumeChanged
-     * @param {number} volume - The requested volume to be applied to the audio input, range <code>0.0</code> &ndash; 
+     * @param {number} volume - The requested volume to be applied to the audio input, range <code>0.0</code> &ndash;
-     *     <code>1.0</code>. The resulting value of <code>Audio.inputVolume</code> depends on the capabilities of the device: 
+     *     <code>1.0</code>. The resulting value of <code>Audio.inputVolume</code> depends on the capabilities of the device:
-     *     for example, the volume can't be changed on some devices, and others might only support values of <code>0.0</code> 
+     *     for example, the volume can't be changed on some devices, and others might only support values of <code>0.0</code>
      *     and <code>1.0</code>.
      * @returns {Signal}
      */
@@ -285,7 +285,7 @@ signals:
     /**jsdoc
      * Triggered when the input audio level changes.
      * @function Audio.inputLevelChanged
-     * @param {number} level - The loudness of the input audio, range <code>0.0</code> (no sound) &ndash; <code>1.0</code> (the 
+     * @param {number} level - The loudness of the input audio, range <code>0.0</code> (no sound) &ndash; <code>1.0</code> (the
      *     onset of clipping).
      * @returns {Signal}
      */