summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_pt
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-06-10 19:02:48 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-06-10 19:02:48 +0200
commitcb38011818063ac2b28fb09c9e34b2fc3a558988 (patch)
tree0fa11852dca63b467e0ce42eac19ca1112bda55a /ftnoir_tracker_pt
parent598be0f84aa6cd5c7f72b223410ada08a627c1f9 (diff)
pt: issue with duplicate symbols on including dshow.h in two files
Let's work around it by including dshow.h in only one file
Diffstat (limited to 'ftnoir_tracker_pt')
-rw-r--r--ftnoir_tracker_pt/ftnoir_tracker_pt.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
index c6f14527..b7138f25 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
@@ -6,7 +6,6 @@
*/
#include "ftnoir_tracker_pt.h"
-#include "opentrack/camera-names.hpp"
#include <QHBoxLayout>
#include <cmath>
#include <QDebug>
@@ -129,6 +128,8 @@ void Tracker::run()
qDebug()<<"Tracker:: Thread stopping";
}
+int camera_name_to_index(const QString &name);
+
void Tracker::apply_settings()
{
qDebug()<<"Tracker:: Applying settings";