From eb790af193135b66db6b7ec3d58167babd9fc87f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 16 Dec 2014 15:30:28 -0800
Subject: [PATCH] hookup previous mouse press for mute to AudioToolBox

---
 interface/src/Application.cpp | 16 +++++++---------
 interface/src/Audio.h         |  1 +
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 0090ad7833..9f932c3bf1 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -77,6 +77,8 @@
 #include "ModelUploader.h"
 #include "Util.h"
 
+#include "audio/AudioToolBox.h"
+
 #include "devices/DdeFaceTracker.h"
 #include "devices/Faceshift.h"
 #include "devices/Leapmotion.h"
@@ -1295,11 +1297,10 @@ void Application::mousePressEvent(QMouseEvent* event, unsigned int deviceID) {
             _mousePressed = true;
             
             if (mouseOnScreen()) {
-                // TODO: MOVE THE AUDIO CONTROLS TO SEP OBJECT
-//                if (_audio.mousePressEvent(getMouseX(), getMouseY())) {
-//                    // stop propagation
-//                    return;
-//                }
+                if (DependencyManager::get<AudioToolBox>()->mousePressEvent(getMouseX(), getMouseY())) {
+                    // stop propagation
+                    return;
+                }
                 
                 if (_rearMirrorTools->mousePressEvent(getMouseX(), getMouseY())) {
                     // stop propagation
@@ -2019,10 +2020,7 @@ void Application::init() {
     _entityClipboardRenderer.setTree(&_entityClipboard);
 
     _metavoxels.init();
-
-    // TODO: MOVE AUDIO CONTROLS TO SEP OBJECT
-//    _audio.init(_glWidget);
-
+    
     _rearMirrorTools = new RearMirrorTools(_glWidget, _mirrorViewRect, _settings);
 
     connect(_rearMirrorTools, SIGNAL(closeView()), SLOT(closeMirrorView()));
diff --git a/interface/src/Audio.h b/interface/src/Audio.h
index 8916f58ff8..6d982f3ed7 100644
--- a/interface/src/Audio.h
+++ b/interface/src/Audio.h
@@ -115,6 +115,7 @@ public slots:
     void stop();
     void addReceivedAudioToStream(const QByteArray& audioByteArray);
     void parseAudioEnvironmentData(const QByteArray& packet);
+    void sendDownstreamAudioStatsPacket() { _stats.sendDownstreamAudioStatsPacket(); }
     void parseAudioStreamStatsPacket(const QByteArray& packet) { _stats.parseAudioStreamStatsPacket(packet); }
     void handleAudioInput();
     void reset();