From 96142160066eea2064789078457015d193390536 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Sat, 23 Feb 2019 14:23:09 -0800
Subject: [PATCH] don't disable server echo when audio qml page is closed

---
 .../qml/hifi/audio/LoopbackAudio.qml          |  9 +-----
 .../src/AudioScriptingInterface.cpp           | 28 +++++++++++++++++++
 .../src/AudioScriptingInterface.h             | 21 ++++++++++++++
 3 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/interface/resources/qml/hifi/audio/LoopbackAudio.qml b/interface/resources/qml/hifi/audio/LoopbackAudio.qml
index 2f0dbe5950..3ecf09c948 100644
--- a/interface/resources/qml/hifi/audio/LoopbackAudio.qml
+++ b/interface/resources/qml/hifi/audio/LoopbackAudio.qml
@@ -17,7 +17,7 @@ import stylesUit 1.0
 import controlsUit 1.0 as HifiControls
 
 RowLayout {
-    property bool audioLoopedBack: false;
+    property bool audioLoopedBack: AudioScriptingInterface.getServerEcho();
     function startAudioLoopback() {
         if (!audioLoopedBack) {
             audioLoopedBack = true;
@@ -31,13 +31,6 @@ RowLayout {
         }
     }
 
-    Component.onDestruction: stopAudioLoopback();
-    onVisibleChanged: {
-        if (!visible) {
-            stopAudioLoopback();
-        }
-    }
-
     HifiConstants { id: hifi; }
 
     Button {
diff --git a/libraries/script-engine/src/AudioScriptingInterface.cpp b/libraries/script-engine/src/AudioScriptingInterface.cpp
index b12b55c3f7..65d71e46e6 100644
--- a/libraries/script-engine/src/AudioScriptingInterface.cpp
+++ b/libraries/script-engine/src/AudioScriptingInterface.cpp
@@ -89,14 +89,42 @@ bool AudioScriptingInterface::isStereoInput() {
     return stereoEnabled;
 }
 
+bool AudioScriptingInterface::getServerEcho() {
+    bool serverEchoEnabled = false;
+    if (_localAudioInterface) {
+        serverEchoEnabled = _localAudioInterface->getServerEcho();
+    }
+    return serverEchoEnabled;
+}
+
 void AudioScriptingInterface::setServerEcho(bool serverEcho) {
     if (_localAudioInterface) {
         QMetaObject::invokeMethod(_localAudioInterface, "setServerEcho", Q_ARG(bool, serverEcho));
     }
 }
 
+void AudioScriptingInterface::toggleServerEcho() {
+    if (_localAudioInterface) {
+        QMetaObject::invokeMethod(_localAudioInterface, "toggleServerEcho");
+    }
+}
+
+bool AudioScriptingInterface::getLocalEcho() {
+    bool localEchoEnabled = false;
+    if (_localAudioInterface) {
+        localEchoEnabled = _localAudioInterface->getLocalEcho();
+    }
+    return localEchoEnabled;
+}
+
 void AudioScriptingInterface::setLocalEcho(bool localEcho) {
     if (_localAudioInterface) {
         QMetaObject::invokeMethod(_localAudioInterface, "setLocalEcho", Q_ARG(bool, localEcho));
     }
 }
+
+void AudioScriptingInterface::toggleLocalEcho() {
+    if (_localAudioInterface) {
+        QMetaObject::invokeMethod(_localAudioInterface, "toggleLocalEcho");
+    }
+}
diff --git a/libraries/script-engine/src/AudioScriptingInterface.h b/libraries/script-engine/src/AudioScriptingInterface.h
index 23cc02248d..a6801dcdcb 100644
--- a/libraries/script-engine/src/AudioScriptingInterface.h
+++ b/libraries/script-engine/src/AudioScriptingInterface.h
@@ -66,18 +66,39 @@ public:
         _localAudioInterface->getAudioSolo().reset();
     }
 
+    /**jsdoc
+     * @function Audio.getServerEcho
+     */
+    Q_INVOKABLE bool getServerEcho();
+
     /**jsdoc
      * @function Audio.setServerEcho
      * @parm {boolean} serverEcho
      */
     Q_INVOKABLE void setServerEcho(bool serverEcho);
 
+    /**jsdoc
+     * @function Audio.toggleServerEcho
+     */
+    Q_INVOKABLE void toggleServerEcho();
+
+    /**jsdoc
+     * @function Audio.getLocalEcho
+     */
+    Q_INVOKABLE bool getLocalEcho();
+
     /**jsdoc
      * @function Audio.setLocalEcho
      * @parm {boolean} localEcho
      */
     Q_INVOKABLE void setLocalEcho(bool localEcho);
 
+    /**jsdoc
+     * @function Audio.toggleLocalEcho
+     */
+    Q_INVOKABLE void toggleLocalEcho();
+
+
 protected:
     AudioScriptingInterface() = default;