diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-12 17:03:51 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-12 17:03:51 +0200 |
| commit | eda47922d9bd6d10e4e2fb3d3191edfaa126aef5 (patch) | |
| tree | 86cef123f082a743275842d0c110dfa3d6115020 /cv/camera-dialog.hpp | |
| parent | 0ed45348c428a950db589caa227efa86af499170 (diff) | |
few: use existing com threading init function
Diffstat (limited to 'cv/camera-dialog.hpp')
| -rw-r--r-- | cv/camera-dialog.hpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/cv/camera-dialog.hpp b/cv/camera-dialog.hpp index 15ae2bc9..3fd853c3 100644 --- a/cv/camera-dialog.hpp +++ b/cv/camera-dialog.hpp @@ -10,6 +10,7 @@ #include "opentrack-compat/camera-names.hpp" #include "opentrack-compat/sleep.hpp" +#include "opentrack-compat/win32-com.hpp" #ifdef __linux # include <QProcess> @@ -17,9 +18,6 @@ #ifdef _WIN32 # include <QTimer> -# include <objbase.h> -# include <winerror.h> -# include <windows.h> #endif #include <opencv2/videoio.hpp> @@ -28,10 +26,6 @@ class camera_dialog { static void maybe_grab_frame(cv::VideoCapture& cap); -#ifdef _WIN32 - static void init_com_threading(); -#endif - public: virtual ~camera_dialog(); void open_camera_settings(cv::VideoCapture*, const QString&, QMutex*); |