summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_ht
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-09-15 20:00:57 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-09-15 20:00:57 +0200
commitfc906d93916d04c81ae712e52045ed56c2788adc (patch)
tree24d05ee0358f83034e28227b14929429224f2682 /ftnoir_tracker_ht
parente5644bff6531717503c14b209041c1a7524e9998 (diff)
Simplify tracker API
No need to have a separate finalization function, can just as well sleep in the destructor.
Diffstat (limited to 'ftnoir_tracker_ht')
-rw-r--r--ftnoir_tracker_ht/ftnoir_tracker_ht.cpp4
-rw-r--r--ftnoir_tracker_ht/ftnoir_tracker_ht.h10
2 files changed, 4 insertions, 10 deletions
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
index 2ca5a3de..27817a0c 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
@@ -149,6 +149,10 @@ Tracker::Tracker() : lck_shm(HT_SHM_NAME, HT_MUTEX_NAME, sizeof(ht_shm_t)), fres
Tracker::~Tracker()
{
+ if (shm) {
+ shm->terminate = true;
+ subprocess.waitForFinished(5000);
+ }
subprocess.kill();
if (shm)
shm->terminate = true;
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.h b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
index fcdea140..5b8eb508 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.h
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
@@ -27,16 +27,6 @@ public:
bool GiveHeadPoseData(double *data);
bool enableTX, enableTY, enableTZ, enableRX, enableRY, enableRZ;
ht_shm_t* shm;
- bool NeedsTimeToFinish() {
- return true;
- }
- void WaitForExit() {
- if (shm) {
- shm->terminate = true;
- subprocess.waitForFinished(5000);
- }
- subprocess.kill();
- }
private:
QTimer timer;
PortableLockedShm lck_shm;