History

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

Andrzej Kapolka committed 13 years ago

Commit 778e4322 parents c8b2ed0 2cf762d68 files · +2191 −1383Browse files

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

Unified · Split

interface/src/Menu.cpp+0−15
@@ -442,21 +442,6 @@ Menu::Menu() : · 441 unmodified lines
442 442
443 QMenu* audioDebugMenu = developerMenu->addMenu("Audio Debugging Tools");443 QMenu* audioDebugMenu = developerMenu->addMenu("Audio Debugging Tools");
444 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoAudio);444 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoAudio);
445 addActionToQMenuAndActionHash(audioDebugMenu,
446 MenuOption::ListenModeNormal,
447 Qt::CTRL | Qt::Key_1,
448 appInstance,
449 SLOT(setListenModeNormal()));
450 addActionToQMenuAndActionHash(audioDebugMenu,
451 MenuOption::ListenModePoint,
452 Qt::CTRL | Qt::Key_2,
453 appInstance,
454 SLOT(setListenModePoint()));
455 addActionToQMenuAndActionHash(audioDebugMenu,
456 MenuOption::ListenModeSingleSource,
457 Qt::CTRL | Qt::Key_3,
458 appInstance,
459 SLOT(setListenModeSingleSource()));
460 445
461 QMenu* voxelProtoOptionsMenu = developerMenu->addMenu("Voxel Server Protocol Options");446 QMenu* voxelProtoOptionsMenu = developerMenu->addMenu("Voxel Server Protocol Options");
462 447