History

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

stojce committed 12 years ago

Commit 1ac583e2 parents 75ad4fd d743df925 files · +1102 −274Browse files

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

Unified · Split

interface/src/Menu.cpp+5−0
@@ -457,6 +457,11 @@ Menu::Menu() : · 456 unmodified lines
457 addCheckableActionToQMenuAndActionHash(renderDebugMenu, MenuOption::CoverageMapV2, Qt::SHIFT | Qt::CTRL | Qt::Key_P);457 addCheckableActionToQMenuAndActionHash(renderDebugMenu, MenuOption::CoverageMapV2, Qt::SHIFT | Qt::CTRL | Qt::Key_P);
458 458
459 QMenu* audioDebugMenu = developerMenu->addMenu("Audio Debugging Tools");459 QMenu* audioDebugMenu = developerMenu->addMenu("Audio Debugging Tools");
460 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioNoiseReduction,
461 0,
462 true,
463 appInstance->getAudio(),
464 SLOT(toggleAudioNoiseReduction()));
460 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoServerAudio);465 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoServerAudio);
461 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoLocalAudio);466 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoLocalAudio);
462 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::MuteAudio,467 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::MuteAudio,