History

Merge branch 'master' into dde-miscellaneous

David Rowe committed 11 years ago

Commit 649d4732 parents 766087c 68a4a1467 files · +1754 −740Browse files

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

Unified · Split

interface/src/Menu.cpp+2−7
@@ -30,7 +30,6 @@ · 29 unmodified lines
3030 #include "devices/Faceshift.h"
3131 #include "devices/RealSense.h"
3232 #include "devices/SixenseManager.h"
33−#include "devices/Visage.h"
3433 #include "MainWindow.h"
3534 #include "scripting/MenuScriptingInterface.h"
3635 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
@@ -376,16 +375,12 @@ Menu::Menu() { · 339 unmodified lines
376375 0, false,
377376 qApp, SLOT(setActiveFaceTracker()));
378377 faceTrackerGroup->addAction(ddeFaceTracker);
379−#endif
380−#ifdef HAVE_VISAGE
381− QAction* visageFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::Visage,
382− 0, false,
383− qApp, SLOT(setActiveFaceTracker()));
384− faceTrackerGroup->addAction(visageFaceTracker);
385378 #endif
386379 }
387380 #ifdef HAVE_DDE
388381 faceTrackingMenu->addSeparator();
382+ QAction* useAudioForMouth = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::UseAudioForMouth, 0, true);
383+ useAudioForMouth->setVisible(false);
389384 QAction* ddeFiltering = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::DDEFiltering, 0, true);
390385 ddeFiltering->setVisible(false);
391386 #endif

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