diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2015-06-10 19:02:48 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-06-10 19:02:48 +0200 |
commit | cb38011818063ac2b28fb09c9e34b2fc3a558988 (patch) | |
tree | 0fa11852dca63b467e0ce42eac19ca1112bda55a | |
parent | 598be0f84aa6cd5c7f72b223410ada08a627c1f9 (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
-rw-r--r-- | ftnoir_tracker_pt/ftnoir_tracker_pt.cpp | 3 | ||||
-rw-r--r-- | opentrack/camera-names.hpp | 3 |
2 files changed, 2 insertions, 4 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"; diff --git a/opentrack/camera-names.hpp b/opentrack/camera-names.hpp index d6b26493..3d3948fa 100644 --- a/opentrack/camera-names.hpp +++ b/opentrack/camera-names.hpp @@ -13,8 +13,6 @@ # include <unistd.h> #endif -// template to allow compiler coalesce function at linking with multiple definitions -template<typename = int> QList<QString> get_camera_names() { QList<QString> ret; #if defined(_WIN32) @@ -84,7 +82,6 @@ QList<QString> get_camera_names() { return ret; } -template<typename = int> int camera_name_to_index(const QString &name) { auto list = get_camera_names(); |