History

hookup previous mouse press for mute to AudioToolBox

Stephen Birarda committed 11 years ago

Commit eb790af1 parent 0fae6992 files · +8 −9Browse files

Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all

Unified · Split

interface/src/Application.cpp+7−9
@@ -77,6 +77,8 @@ · 76 unmodified lines
77#include "ModelUploader.h"77#include "ModelUploader.h"
78#include "Util.h"78#include "Util.h"
79 79
80#include "audio/AudioToolBox.h"
81
80#include "devices/DdeFaceTracker.h"82#include "devices/DdeFaceTracker.h"
81#include "devices/Faceshift.h"83#include "devices/Faceshift.h"
82#include "devices/Leapmotion.h"84#include "devices/Leapmotion.h"
@@ -1295,11 +1297,10 @@ void Application::mousePressEvent(QMouseEvent* event, unsigned int deviceID) { · 1212 unmodified lines
1295 _mousePressed = true;1297 _mousePressed = true;
1296 1298
1297 if (mouseOnScreen()) {1299 if (mouseOnScreen()) {
1298 // TODO: MOVE THE AUDIO CONTROLS TO SEP OBJECT1300 if (DependencyManager::get<AudioToolBox>()->mousePressEvent(getMouseX(), getMouseY())) {
1299// if (_audio.mousePressEvent(getMouseX(), getMouseY())) {1301 // stop propagation
1300// // stop propagation1302 return;
1301// return;1303 }
1302// }
1303 1304
1304 if (_rearMirrorTools->mousePressEvent(getMouseX(), getMouseY())) {1305 if (_rearMirrorTools->mousePressEvent(getMouseX(), getMouseY())) {
1305 // stop propagation1306 // stop propagation
@@ -2019,10 +2020,7 @@ void Application::init() { · 713 unmodified lines
2019 _entityClipboardRenderer.setTree(&_entityClipboard);2020 _entityClipboardRenderer.setTree(&_entityClipboard);
2020 2021
2021 _metavoxels.init();2022 _metavoxels.init();
2022 2023
2023 // TODO: MOVE AUDIO CONTROLS TO SEP OBJECT
2024// _audio.init(_glWidget);
2025
2026 _rearMirrorTools = new RearMirrorTools(_glWidget, _mirrorViewRect, _settings);2024 _rearMirrorTools = new RearMirrorTools(_glWidget, _mirrorViewRect, _settings);
2027 2025
2028 connect(_rearMirrorTools, SIGNAL(closeView()), SLOT(closeMirrorView()));2026 connect(_rearMirrorTools, SIGNAL(closeView()), SLOT(closeMirrorView()));

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t