History

Merge branch 'master' of github.com:/worklist/hifi

Leonardo Murillo committed 12 years ago

Commit 91defcf2 parents a13d7b0 bb41fe65 files · +30 −7Browse files

Unified · Split

5 files
  1. interface/src/Application.cpp +0 −1
  2. interface/src/Audio.cpp +6 −1
  3. interface/src/Audio.h +6 −0
  4. interface/src/Menu.cpp +16 −5
  5. interface/src/Menu.h +2 −0
interface/src/Application.cpp+0−1
@@ -2176,7 +2176,6 @@ void Application::updateMouseVoxels(float deltaTime, glm::vec3& mouseRayOrigin, · 2175 unmodified lines
21762176
21772177 _mouseVoxel.s = 0.0f;
21782178 bool wasInitialized = _mouseVoxelScaleInitialized;
2179− _mouseVoxelScaleInitialized = false;
21802179 if (Menu::getInstance()->isVoxelModeActionChecked() &&
21812180 (fabs(_myAvatar.getVelocity().x) +
21822181 fabs(_myAvatar.getVelocity().y) +
interface/src/Audio.cpp+6−1
@@ -530,12 +530,17 @@ void Audio::addReceivedAudioToBuffer(const QByteArray& audioByteArray) { · 529 unmodified lines
530530
531531 bool Audio::mousePressEvent(int x, int y) {
532532 if (_iconBounds.contains(x, y)) {
533− _muted = !_muted;
533+ toggleMute();
534534 return true;
535535 }
536536 return false;
537537 }
538538
539+void Audio::toggleMute() {
540+ _muted = !_muted;
541+ muteToggled();
542+}
543+
539544 void Audio::render(int screenWidth, int screenHeight) {
540545 if (_audioInput) {
541546 glLineWidth(2.0);
interface/src/Audio.h+6−0
@@ -62,6 +62,8 @@ public: · 61 unmodified lines
6262
6363 bool getCollisionFlashesScreen() { return _collisionFlashesScreen; }
6464
65+ bool getMuted() { return _muted; }
66+
6567 void init(QGLWidget *parent = 0);
6668 bool mousePressEvent(int x, int y);
6769
@@ -70,8 +72,12 @@ public slots: · 2 unmodified lines
7072 void addReceivedAudioToBuffer(const QByteArray& audioByteArray);
7173 void handleAudioInput();
7274 void reset();
75+ void toggleMute();
7376
7477 virtual void handleAudioByteArray(const QByteArray& audioByteArray);
78+
79+signals:
80+ bool muteToggled();
7581
7682 private:
7783 QByteArray firstInputFrame;
interface/src/Menu.cpp+16−5
@@ -167,7 +167,9 @@ Menu::Menu() : · 166 unmodified lines
167167 true,
168168 appInstance->getAvatar(),
169169 SLOT(setWantCollisionsOn(bool)));
170−
170+
171+ addCheckableActionToQMenuAndActionHash(editMenu, MenuOption::ClickToFly);
172+
171173 QMenu* toolsMenu = addMenu("Tools");
172174
173175 _voxelModeActionsGroup = new QActionGroup(this);
@@ -188,8 +190,6 @@ Menu::Menu() : · 14 unmodified lines
188190 QAction* getColorMode = addCheckableActionToQMenuAndActionHash(toolsMenu, MenuOption::VoxelGetColorMode, Qt::Key_G);
189191 _voxelModeActionsGroup->addAction(getColorMode);
190192
191− addCheckableActionToQMenuAndActionHash(toolsMenu, MenuOption::ClickToFly);
192−
193193
194194 // connect each of the voxel mode actions to the updateVoxelModeActionsSlot
195195 foreach (QAction* action, _voxelModeActionsGroup->actions()) {
@@ -455,13 +455,19 @@ Menu::Menu() : · 259 unmodified lines
455455 QMenu* audioDebugMenu = developerMenu->addMenu("Audio Debugging Tools");
456456 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoServerAudio);
457457 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoLocalAudio);
458−
458+ addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::MuteAudio,
459+ Qt::CTRL | Qt::Key_M,
460+ false,
461+ appInstance->getAudio(),
462+ SLOT(toggleMute()));
463+
459464 addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel,
460465 Qt::CTRL | Qt::SHIFT | Qt::Key_V,
461466 this,
462467 SLOT(pasteToVoxel()));
463468
464−
469+ connect(appInstance->getAudio(), SIGNAL(muteToggled()), this, SLOT(audioMuteToggled()));
470+
465471 #ifndef Q_OS_MAC
466472 QMenu* helpMenu = addMenu("Help");
467473 QAction* helpAction = helpMenu->addAction(MenuOption::AboutApp);
@@ -1002,6 +1008,11 @@ void Menu::bandwidthDetails() { · 534 unmodified lines
10021008 _bandwidthDialog->raise();
10031009 }
10041010
1011+void Menu::audioMuteToggled() {
1012+ QAction *muteAction = _actionHash.value(MenuOption::MuteAudio);
1013+ muteAction->setChecked(Application::getInstance()->getAudio()->getMuted());
1014+}
1015+
10051016 void Menu::bandwidthDetailsClosed() {
10061017 if (_bandwidthDialog) {
10071018 delete _bandwidthDialog;
interface/src/Menu.h+2−0
@@ -107,6 +107,7 @@ private slots: · 106 unmodified lines
107107 void chooseVoxelPaintColor();
108108 void runTests();
109109 void resetSwatchColors();
110+ void audioMuteToggled();
110111
111112 private:
112113 static Menu* _instance;
@@ -184,6 +185,7 @@ namespace MenuOption { · 71 unmodified lines
184185 const QString EnableVoxelPacketCompression = "Enable Voxel Packet Compression";
185186 const QString EchoServerAudio = "Echo Server Audio";
186187 const QString EchoLocalAudio = "Echo Local Audio";
188+ const QString MuteAudio = "Mute Microphone";
187189 const QString ExportVoxels = "Export Voxels";
188190 const QString DontFadeOnVoxelServerChanges = "Don't Fade In/Out on Voxel Server Changes";
189191 const QString HeadMouse = "Head Mouse";

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