History

Remove faceshift

Brad Davis committed 9 years ago

Commit 5e1bc0d1 parent 2c2f51627 files · +149 −687Browse files

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

Unified · Split

interface/src/Menu.cpp+2−10
@@ -34,7 +34,6 @@ · 33 unmodified lines
3434 #include "avatar/AvatarManager.h"
3535 #include "AvatarBookmarks.h"
3636 #include "devices/DdeFaceTracker.h"
37−#include "devices/Faceshift.h"
3837 #include "MainWindow.h"
3938 #include "render/DrawStatus.h"
4039 #include "scripting/MenuScriptingInterface.h"
@@ -451,12 +450,6 @@ Menu::Menu() { · 410 unmodified lines
451450 qApp, SLOT(setActiveFaceTracker()));
452451 faceTrackerGroup->addAction(noFaceTracker);
453452
454−#ifdef HAVE_FACESHIFT
455− QAction* faceshiftFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::Faceshift,
456− 0, false,
457− qApp, SLOT(setActiveFaceTracker()));
458− faceTrackerGroup->addAction(faceshiftFaceTracker);
459−#endif
460453 #ifdef HAVE_DDE
461454 QAction* ddeFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::UseCamera,
462455 0, true,
@@ -477,11 +470,10 @@ Menu::Menu() { · 14 unmodified lines
477470 QAction* ddeCalibrate = addActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::CalibrateCamera, 0,
478471 DependencyManager::get<DdeFaceTracker>().data(), SLOT(calibrate()));
479472 ddeCalibrate->setVisible(true); // DDE face tracking is on by default
480−#endif
481−#if defined(HAVE_FACESHIFT) || defined(HAVE_DDE)
482473 faceTrackingMenu->addSeparator();
483474 addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::MuteFaceTracking,
484− Qt::CTRL | Qt::SHIFT | Qt::Key_F, true); // DDE face tracking is on by default
475+ [](bool mute) { FaceTracker::setIsMuted(mute); },
476+ Qt::CTRL | Qt::SHIFT | Qt::Key_F, FaceTracker::isMuted());
485477 addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::AutoMuteAudio, 0, false);
486478 #endif
487479

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