History

Merge branch 'master' of https://github.com/highfidelity/hifi into orange

Sam Gateau committed 11 years ago

Commit 5ebbdac2 parents 1046356 a105f5717 files · +221 −86Browse files

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

Unified · Split

interface/src/Application.cpp+7−1
@@ -611,6 +611,10 @@ void Application::cleanupBeforeQuit() { · 610 unmodified lines
611 611
612 // destroy the AudioClient so it and its thread have a chance to go down safely612 // destroy the AudioClient so it and its thread have a chance to go down safely
613 DependencyManager::destroy<AudioClient>();613 DependencyManager::destroy<AudioClient>();
614
615#ifdef HAVE_DDE
616 DependencyManager::destroy<DdeFaceTracker>();
617#endif
614}618}
615 619
616Application::~Application() { 620Application::~Application() {
@@ -1742,8 +1746,10 @@ FaceTracker* Application::getActiveFaceTracker() { · 1125 unmodified lines
1742void Application::setActiveFaceTracker() {1746void Application::setActiveFaceTracker() {
1743#ifdef HAVE_FACESHIFT1747#ifdef HAVE_FACESHIFT
1744 DependencyManager::get<Faceshift>()->setTCPEnabled(Menu::getInstance()->isOptionChecked(MenuOption::Faceshift));1748 DependencyManager::get<Faceshift>()->setTCPEnabled(Menu::getInstance()->isOptionChecked(MenuOption::Faceshift));
1745#endif 1749#endif
1750#ifdef HAVE_DDE
1746 DependencyManager::get<DdeFaceTracker>()->setEnabled(Menu::getInstance()->isOptionChecked(MenuOption::DDEFaceRegression));1751 DependencyManager::get<DdeFaceTracker>()->setEnabled(Menu::getInstance()->isOptionChecked(MenuOption::DDEFaceRegression));
1752#endif
1747#ifdef HAVE_VISAGE1753#ifdef HAVE_VISAGE
1748 DependencyManager::get<Visage>()->updateEnabled();1754 DependencyManager::get<Visage>()->updateEnabled();
1749#endif1755#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