Showing the changes to interface/src/Menu.cpp (1 of 27 files). Show all
Unified · Split
| @@ -34,7 +34,6 @@ · 33 unmodified lines | ||
| 34 | 34 | #include "avatar/AvatarManager.h" |
| 35 | 35 | #include "AvatarBookmarks.h" |
| 36 | 36 | #include "devices/DdeFaceTracker.h" |
| 37 | −#include "devices/Faceshift.h" | |
| 38 | 37 | #include "MainWindow.h" |
| 39 | 38 | #include "render/DrawStatus.h" |
| 40 | 39 | #include "scripting/MenuScriptingInterface.h" |
| @@ -451,12 +450,6 @@ Menu::Menu() { · 410 unmodified lines | ||
| 451 | 450 | qApp, SLOT(setActiveFaceTracker())); |
| 452 | 451 | faceTrackerGroup->addAction(noFaceTracker); |
| 453 | 452 | |
| 454 | −#ifdef HAVE_FACESHIFT | |
| 455 | − QAction* faceshiftFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::Faceshift, | |
| 456 | − 0, false, | |
| 457 | − qApp, SLOT(setActiveFaceTracker())); | |
| 458 | − faceTrackerGroup->addAction(faceshiftFaceTracker); | |
| 459 | −#endif | |
| 460 | 453 | #ifdef HAVE_DDE |
| 461 | 454 | QAction* ddeFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::UseCamera, |
| 462 | 455 | 0, true, |
| @@ -477,11 +470,10 @@ Menu::Menu() { · 14 unmodified lines | ||
| 477 | 470 | QAction* ddeCalibrate = addActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::CalibrateCamera, 0, |
| 478 | 471 | DependencyManager::get<DdeFaceTracker>().data(), SLOT(calibrate())); |
| 479 | 472 | ddeCalibrate->setVisible(true); // DDE face tracking is on by default |
| 480 | −#endif | |
| 481 | −#if defined(HAVE_FACESHIFT) || defined(HAVE_DDE) | |
| 482 | 473 | faceTrackingMenu->addSeparator(); |
| 483 | 474 | 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()); | |
| 485 | 477 | addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::AutoMuteAudio, 0, false); |
| 486 | 478 | #endif |
| 487 | 479 | |