From 6e89437bce8f3a3ce9d286da8a8e17912dfa5725 Mon Sep 17 00:00:00 2001
From: Philip Rosedale <philip@highfidelity.io>
Date: Thu, 20 Nov 2014 19:34:56 -0600
Subject: [PATCH] simplify audio scope menu(s)

---
 interface/src/Menu.cpp | 7 +++----
 interface/src/Menu.h   | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 1eacfa8363..ff34c0200c 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -625,17 +625,16 @@ Menu::Menu() :
         audioSourceGroup->addAction(sine440);
     }
 
-    addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioScope,
+    QMenu* audioScopeMenu = audioDebugMenu->addMenu("Audio Scope");
+    addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScope,
                                            Qt::CTRL | Qt::Key_P, false,
                                            appInstance->getAudio(),
                                            SLOT(toggleScope()));
-    addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioScopePause,
+    addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopePause,
                                            Qt::CTRL | Qt::SHIFT | Qt::Key_P ,
                                            false,
                                            appInstance->getAudio(),
                                            SLOT(toggleScopePause()));
-
-    QMenu* audioScopeMenu = audioDebugMenu->addMenu("Audio Scope");
     addDisabledActionAndSeparator(audioScopeMenu, "Display Frames");
     {
         QAction *fiveFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeFiveFrames,
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 7ed8811b4f..2f5ccc533c 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -338,11 +338,11 @@ namespace MenuOption {
     const QString AudioFilterBassCut = "Bass Cut";
     const QString AudioFilterSmiley = "Smiley Curve";
     const QString AudioNoiseReduction = "Audio Noise Reduction";
-    const QString AudioScope = "Audio Scope";
+    const QString AudioScope = "Show Scope";
     const QString AudioScopeFiftyFrames = "Fifty";
     const QString AudioScopeFiveFrames = "Five";
     const QString AudioScopeFrames = "Display Frames";
-    const QString AudioScopePause = "Pause Audio Scope";
+    const QString AudioScopePause = "Pause Scope";
     const QString AudioScopeTwentyFrames = "Twenty";
     const QString AudioStats = "Audio Stats";
     const QString AudioStatsShowInjectedStreams = "Audio Stats Show Injected Streams";