From 68fa44f845aa5b45c851079f47eb7bf050101d5a Mon Sep 17 00:00:00 2001
From: Craig Hansen-Sturm <chansensturm@comcast.net>
Date: Fri, 5 Sep 2014 18:30:39 -0700
Subject: [PATCH] audio menu changes to support tone and noise generators

---
 interface/src/Menu.cpp | 24 ++++++++++++++++++++++--
 interface/src/Menu.h   |  4 +++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 0dcfd60051..c2620c1e46 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -544,11 +544,31 @@ Menu::Menu() :
                                   0,
                                   this,
                                   SLOT(muteEnvironment()));
-    addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioToneInjection,
+
+    addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioSourceInject,
                                            0,
                                            false,
                                            appInstance->getAudio(),
-                                           SLOT(toggleToneInjection()));
+                                           SLOT(toggleAudioSourceInject()));
+    QMenu* audioSourceMenu = audioDebugMenu->addMenu("Generated Audio Source"); 
+    {
+        QAction *pinkNoise = addCheckableActionToQMenuAndActionHash(audioSourceMenu, MenuOption::AudioSourcePinkNoise,
+                                                               0,
+                                                               false,
+                                                               appInstance->getAudio(),
+                                                               SLOT(selectAudioSourcePinkNoise()));
+        
+        QAction *sine440 = addCheckableActionToQMenuAndActionHash(audioSourceMenu, MenuOption::AudioSourceSine440,
+                                                                    0,
+                                                                    true,
+                                                                    appInstance->getAudio(),
+                                                                    SLOT(selectAudioSourceSine440));
+
+        QActionGroup* audioSourceGroup = new QActionGroup(audioSourceMenu);
+        audioSourceGroup->addAction(pinkNoise);
+        audioSourceGroup->addAction(sine440);
+    }
+
     addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioScope,
                                            Qt::CTRL | Qt::Key_P, false,
                                            appInstance->getAudio(),
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 1d57da2891..a00da23b7b 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -346,7 +346,9 @@ namespace MenuOption {
     const QString AudioSpatialProcessingSlightlyRandomSurfaces = "Slightly Random Surfaces";
     const QString AudioSpatialProcessingStereoSource = "Stereo Source";
     const QString AudioSpatialProcessingWithDiffusions = "With Diffusions";
-    const QString AudioToneInjection = "Inject Test Tone";
+    const QString AudioSourceInject = "Generated Audio";
+    const QString AudioSourcePinkNoise = "Pink Noise";
+    const QString AudioSourceSine440 = "Sine 440hz";
     const QString Avatars = "Avatars";
     const QString AvatarsReceiveShadows = "Avatars Receive Shadows";
     const QString Bandwidth = "Bandwidth Display";