summaryrefslogtreecommitdiffhomepage
path: root/tracker-ht
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-08-12 18:00:49 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-08-12 18:00:49 +0200
commit9040b187a1c4fa380f8a12207b9dd6d04b3a10ac (patch)
tree115e1351571d690c1261a9d512e6d44e717f3051 /tracker-ht
parent13a18b149764509a3f460be86590250cdcf690fb (diff)
all: rename modules s#^opentrack-##. and opentrack -> api
Adjust usages.
Diffstat (limited to 'tracker-ht')
-rw-r--r--tracker-ht/ftnoir_tracker_ht.cpp32
-rw-r--r--tracker-ht/ftnoir_tracker_ht.h8
2 files changed, 20 insertions, 20 deletions
diff --git a/tracker-ht/ftnoir_tracker_ht.cpp b/tracker-ht/ftnoir_tracker_ht.cpp
index 1ffc387e..045d05f8 100644
--- a/tracker-ht/ftnoir_tracker_ht.cpp
+++ b/tracker-ht/ftnoir_tracker_ht.cpp
@@ -1,21 +1,21 @@
#include "headtracker-ftnoir.h"
#include "ftnoir_tracker_ht.h"
#include "ui_ht-trackercontrols.h"
-#include "opentrack/plugin-api.hpp"
+#include "api/plugin-api.hpp"
#include <cmath>
-#include "opentrack/camera-names.hpp"
-#include "opentrack-compat/sleep.hpp"
+#include "api/camera-names.hpp"
+#include "compat/sleep.hpp"
typedef struct {
- int width;
- int height;
+ int width;
+ int height;
} resolution_tuple;
static resolution_tuple resolution_choices[] = {
- { 640, 480 },
- { 320, 240 },
- { 320, 200 },
- { 0, 0 }
+ { 640, 480 },
+ { 320, 240 },
+ { 320, 200 },
+ { 0, 0 }
};
void Tracker::load_settings(ht_config_t* config)
@@ -63,9 +63,9 @@ void Tracker::load_settings(ht_config_t* config)
int res = s.resolution;
if (res < 0 || res >= (int)(sizeof(resolution_choices) / sizeof(resolution_tuple)))
- res = 0;
- resolution_tuple r = resolution_choices[res];
- config->force_width = r.width;
+ res = 0;
+ resolution_tuple r = resolution_choices[res];
+ config->force_width = r.width;
config->force_height = r.height;
config->flandmark_delay = 50;
for (int i = 0; i < 5; i++)
@@ -86,10 +86,10 @@ Tracker::~Tracker()
should_stop = true;
wait();
ht_free_context(ht);
- if (layout)
- delete layout;
- if (videoWidget)
- delete videoWidget;
+ if (layout)
+ delete layout;
+ if (videoWidget)
+ delete videoWidget;
}
void Tracker::start_tracker(QFrame* videoframe)
diff --git a/tracker-ht/ftnoir_tracker_ht.h b/tracker-ht/ftnoir_tracker_ht.h
index 1ec3467a..96fd258d 100644
--- a/tracker-ht/ftnoir_tracker_ht.h
+++ b/tracker-ht/ftnoir_tracker_ht.h
@@ -10,11 +10,11 @@
#include "headtracker-ftnoir.h"
#include "ui_ht-trackercontrols.h"
#include "ht_video_widget.h"
-#include "opentrack-compat/shm.h"
+#include "compat/shm.h"
#include <QObject>
-#include "opentrack-compat/options.hpp"
-#include "opentrack/plugin-api.hpp"
-#include "opentrack/opencv-camera-dialog.hpp"
+#include "compat/options.hpp"
+#include "api/plugin-api.hpp"
+#include "api/opencv-camera-dialog.hpp"
#include <QThread>
#include <QMutex>