Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 06:44:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

hookup previous mouse press for mute to AudioToolBox

Browse source
This commit is contained in:
Stephen Birarda 2014-12-16 15:30:28 -08:00
parent 0fae699ed3
commit eb790af193
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/src/Application.cpp
View file

@ -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()));

1
interface/src/Audio.h
View file

@ -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();