From 390c59b45c57591ff87655b28ca5602836f4520a Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Mon, 4 Dec 2017 12:11:17 -0800
Subject: [PATCH] Change menu and minor fixes

---
 interface/resources/qml/AudioScope.qml        |  6 +++-
 interface/src/Menu.cpp                        | 29 +------------------
 .../developer/utilities/audio/audioScope.js   | 13 +++++++--
 3 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/interface/resources/qml/AudioScope.qml b/interface/resources/qml/AudioScope.qml
index 1f67b3f090..677567c5c2 100644
--- a/interface/resources/qml/AudioScope.qml
+++ b/interface/resources/qml/AudioScope.qml
@@ -376,7 +376,7 @@ Item {
         anchors.leftMargin: 20;
         checked: AudioScope.getVisible();
         onCheckedChanged: {     
-            AudioScope.setVisible(!AudioScope.getVisible());
+            AudioScope.setVisible(checked);
             activelabel.text = AudioScope.getVisible() ? "On" : "Off"
         }
     }
@@ -617,6 +617,10 @@ Item {
             stopRecording();
         }
         AudioScope.setVisible(false);
+        AudioScope.setLocalEcho(false);
+        AudioScope.setServerEcho(false);
+        AudioScope.selectAudioScopeFiveFrames();
+        console.log("Component Destroyed");
     }
     
     Connections {
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 7292594b53..9bbb72357b 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -679,43 +679,16 @@ Menu::Menu() {
     });
 
     auto audioIO = DependencyManager::get<AudioClient>();
-    addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoServerAudio, 0, false,
-        audioIO.data(), SLOT(toggleServerEcho()));
-    addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoLocalAudio, 0, false,
-        audioIO.data(), SLOT(toggleLocalEcho()));
     addActionToQMenuAndActionHash(audioDebugMenu, MenuOption::MuteEnvironment, 0,
         audioIO.data(), SLOT(sendMuteEnvironmentPacket()));
 
-    auto scope = DependencyManager::get<AudioScope>();
-    MenuWrapper* audioScopeMenu = audioDebugMenu->addMenu("Audio Scope");
-
-    action = addActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScope);
+    action = addActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioScope);
     connect(action, &QAction::triggered, [] {
         auto scriptEngines = DependencyManager::get<ScriptEngines>();
         QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
         defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/audio/audioScope.js");
         scriptEngines->loadScript(defaultScriptsLoc.toString());
     });
-    
-    addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopePause, Qt::CTRL | Qt::SHIFT | Qt::Key_F2, false,
-        scope.data(), SLOT(togglePause()));
-
-    addDisabledActionAndSeparator(audioScopeMenu, "Display Frames");
-    {
-        QAction* fiveFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeFiveFrames,
-            0, true, scope.data(), SLOT(selectAudioScopeFiveFrames()));
-
-        QAction* twentyFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeTwentyFrames,
-            0, false, scope.data(), SLOT(selectAudioScopeTwentyFrames()));
-
-        QAction* fiftyFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeFiftyFrames,
-            0, false, scope.data(), SLOT(selectAudioScopeFiftyFrames()));
-
-        QActionGroup* audioScopeFramesGroup = new QActionGroup(audioScopeMenu);
-        audioScopeFramesGroup->addAction(fiveFrames);
-        audioScopeFramesGroup->addAction(twentyFrames);
-        audioScopeFramesGroup->addAction(fiftyFrames);
-    }
 
     // Developer > Physics >>>
     MenuWrapper* physicsOptionsMenu = developerMenu->addMenu("Physics");
diff --git a/scripts/developer/utilities/audio/audioScope.js b/scripts/developer/utilities/audio/audioScope.js
index 3331482fbd..00c9e4b725 100644
--- a/scripts/developer/utilities/audio/audioScope.js
+++ b/scripts/developer/utilities/audio/audioScope.js
@@ -1,10 +1,17 @@
 var qml = Script.resourcesPath() + '/qml/AudioScope.qml';
-var viewdim = Controller.getViewportDimensions();
 var window = new OverlayWindow({
     title: 'Audio Scope',
     source: qml,
     width: 1200,
     height: 500
 });
-//window.setPosition(0.1*viewdim, 0.2*viewdim);
-window.closed.connect(function () { Script.stop(); });
\ No newline at end of file
+window.closed.connect(function () { 
+	if (Audio.getRecording()) {
+		Audio.stopRecording();
+	}
+	AudioScope.setVisible(false);
+	AudioScope.setLocalEcho(false);
+	AudioScope.setServerEcho(false);
+	AudioScope.selectAudioScopeFiveFrames();
+	Script.stop(); 
+});
\ No newline at end of file