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