From bac448af5dbe6b9e4cc15478bc7411f5e60cf985 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Sun, 18 Jan 2015 05:29:25 -0800
Subject: [PATCH] Mute mute slot out of Menu

---
 interface/src/Audio.cpp | 8 ++++++++
 interface/src/Audio.h   | 3 +++
 interface/src/Menu.cpp  | 9 ---------
 interface/src/Menu.h    | 1 -
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index ce50e093e4..6c7705a56c 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -97,10 +97,18 @@ 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 34b36d41ac..0d6ffcfb1d 100644
--- a/interface/src/Audio.h
+++ b/interface/src/Audio.h
@@ -173,6 +173,9 @@ public slots:
 
     void outputNotify();
     
+private slots:
+    void audioMuteToggled();
+    
 signals:
     bool muteToggled();
     void inputReceived(const QByteArray& inputSamples);
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 19b6f74d8e..bad6421fd9 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -569,8 +569,6 @@ Menu::Menu() {
                                             statsRenderer.data(),
                                             SLOT(toggleShowInjectedStreams()));
 
-    connect(audioIO.data(), SIGNAL(muteToggled()), this, SLOT(audioMuteToggled()));
-
 #ifndef Q_OS_MAC
     QMenu* helpMenu = addMenu("Help");
     QAction* helpAction = helpMenu->addAction(MenuOption::AboutApp);
@@ -1173,13 +1171,6 @@ void Menu::loadRSSDKFile() {
     RealSense::getInstance()->loadRSSDKFile();
 }
 
-void Menu::audioMuteToggled() {
-    QAction *muteAction = _actionHash.value(MenuOption::MuteAudio);
-    if (muteAction) {
-        muteAction->setChecked(DependencyManager::get<Audio>()->isMuted());
-    }
-}
-
 void Menu::runTests() {
     runTimingTests();
 }
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 9e0cea66a5..3467f26c80 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -159,7 +159,6 @@ private slots:
     void bumpSettings();
     void changePrivateKey();
     void runTests();
-    void audioMuteToggled();
     void displayNameLocationResponse(const QString& errorString);
     void changeVSync();
     void loadRSSDKFile();