From dbdb87a1a2c04ffd123b5b3b51ad203b858c68e1 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 27 Jan 2015 01:21:59 -0800
Subject: [PATCH] Moved Menu dependency out of audio

---
 interface/src/Application.cpp | 7 +++++++
 interface/src/Application.h   | 2 ++
 interface/src/Audio.cpp       | 8 --------
 interface/src/Audio.h         | 3 ---
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index d6bf2f4b81..8455ae2bce 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -296,6 +296,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
     auto audioIO = DependencyManager::get<Audio>();
     audioIO->moveToThread(audioThread);
     connect(audioThread, &QThread::started, audioIO.data(), &Audio::start);
+    connect(audioIO, SIGNAL(muteToggled()), this, SLOT(audioMuteToggled()));
 
     audioThread->start();
     
@@ -693,6 +694,12 @@ void Application::runTests() {
     runTimingTests();
 }
 
+void Application::audioMuteToggled() {
+    QAction* muteAction = Menu::getInstance()->getActionForOption(MenuOption::MuteAudio);
+    Q_CHECK_PTR(muteAction);
+    muteAction->setChecked(DependencyManager::get<Audio>()->isMuted());
+}
+
 void Application::aboutApp() {
     InfoView::forcedShow(INFO_HELP_PATH);
 }
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 0d90196a5d..e57947a20e 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -395,6 +395,8 @@ private slots:
     void manageRunningScriptsWidgetVisibility(bool shown);
     
     void runTests();
+    
+    void audioMuteToggled();
 
 private:
     void resetCamerasOnResizeGL(Camera& camera, int width, int height);
diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index 311dcc7155..91d5262bae 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -104,18 +104,10 @@ Audio::Audio() :
     
     connect(&_receivedAudioStream, &MixedProcessedAudioStream::processSamples, this, &Audio::processReceivedSamples, Qt::DirectConnection);
     
-    connect(this, SIGNAL(muteToggled()), this, SLOT(audioMuteToggled()));
-    
     // Initialize GVerb
     initGverb();
 }
 
-void Audio::audioMuteToggled() {
-    QAction* muteAction = Menu::getInstance()->getActionForOption(MenuOption::MuteAudio);
-    Q_CHECK_PTR(muteAction);
-    muteAction->setChecked(isMuted());
-}
-
 void Audio::reset() {
     _receivedAudioStream.reset();
     _stats.reset();
diff --git a/interface/src/Audio.h b/interface/src/Audio.h
index d122830b44..67fbe7b3d4 100644
--- a/interface/src/Audio.h
+++ b/interface/src/Audio.h
@@ -176,9 +176,6 @@ public slots:
     void loadSettings();
     void saveSettings();
     
-private slots:
-    void audioMuteToggled();
-    
 signals:
     bool muteToggled();
     void inputReceived(const QByteArray& inputSamples);