Merge pull request #5357 from ctrlaltdavid/scriptable-muting

Mute / un-mute face tracking when menu item is changed from script

Philip Rosedale committed 11 years ago

Commit 61c2b172 parents 916069c 550e9223 files · +8 −11Browse files

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

Unified · Split

@@ -439,8 +439,7 @@ Menu::Menu() { · 438 unmodified lines
439	#if defined(HAVE_FACESHIFT) \|\| defined(HAVE_DDE)	439	#if defined(HAVE_FACESHIFT) \|\| defined(HAVE_DDE)
440	faceTrackingMenu->addSeparator();	440	faceTrackingMenu->addSeparator();
441	addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::MuteFaceTracking,	441	addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::MuteFaceTracking,
442	Qt::CTRL \| Qt::SHIFT \| Qt::Key_F, true, // DDE face tracking is on by default	442	Qt::CTRL \| Qt::SHIFT \| Qt::Key_F, true); // DDE face tracking is on by default
443	qApp, SLOT(toggleFaceTrackerMute()));
444	addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::AutoMuteAudio, 0, false);	443	addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::AutoMuteAudio, 0, false);
445	#endif	444	#endif
446		445

Keyboard shortcuts