Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 20:23:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2908 from murillodigital/master

Browse source 
Revert "Initialise lisencing manager after we have enabled Visage."
This commit is contained in:
Leonardo Murillo 2014-05-23 09:44:23 -06:00
commit c4e807d3d9
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
interface/src/devices/Visage.cpp
View file

@ -41,8 +41,14 @@ Visage::Visage() :
_headOrigin(DEFAULT_HEAD_ORIGIN) { _headOrigin(DEFAULT_HEAD_ORIGIN) {
#ifdef HAVE_VISAGE #ifdef HAVE_VISAGE
_tracker = NULL; #ifdef WIN32
_data = NULL; QByteArray licensePath = Application::resourcesPath().toLatin1() + "visage";
#else
QByteArray licensePath = Application::resourcesPath().toLatin1() + "visage/license.vlc";
#endif
initializeLicenseManager(licensePath.data());
_tracker = new VisageTracker2(Application::resourcesPath().toLatin1() + "visage/tracker.cfg");
_data = new FaceData();
#endif #endif
} }
@ -173,19 +179,6 @@ void Visage::setEnabled(bool enabled) {
return; return;
} }
if ((_enabled = enabled)) { if ((_enabled = enabled)) {
if(_tracker == NULL && _data == NULL){
#ifdef WIN32
QByteArray licensePath = Application::resourcesPath().toLatin1() + "visage";
#else
QByteArray licensePath = Application::resourcesPath().toLatin1() + "visage/license.vlc";
#endif
initializeLicenseManager(licensePath.data());
_tracker = new VisageTracker2(Application::resourcesPath().toLatin1() + "visage/tracker.cfg");
_data = new FaceData();
}
_tracker->trackFromCam(); _tracker->trackFromCam();
} else { } else {
_tracker->stop(); _tracker->stop();