Merge branch 'unstable' into trackhat-ui

1 files changed, 3 insertions, 14 deletions

diff --git a/ftnoir_tracker_pt/camera.h b/ftnoir_tracker_pt/camera.h
index 2c42652a..343446ac 100644
--- a/ftnoir_tracker_pt/camera.h
+++ b/ftnoir_tracker_pt/camera.h
@@ -8,21 +8,10 @@
 #pragma once
 
 #include <opencv2/core/core.hpp>
-#ifndef OPENTRACK_API
-#   include <boost/shared_ptr.hpp>
-#else
-#   include <memory>
-#   include <opencv2/highgui/highgui.hpp>
-#   include <opencv2/highgui/highgui_c.h>
-#endif
+#include <memory>
+#include <opencv2/highgui.hpp>
 #include <string>
 
-#ifndef OPENTRACK_API
-// ----------------------------------------------------------------------------
-void get_camera_device_names(std::vector<std::string>& device_names);
-#endif
-
-// ----------------------------------------------------------------------------
 struct CamInfo
 {
     CamInfo() : res_x(0), res_y(0), fps(0) {}
@@ -89,7 +78,7 @@ public:
     void start() override;
     void stop() override;
 
-    operator cv::VideoCapture&() { return *cap; }
+    operator cv::VideoCapture*() { return cap; }
 
 protected:
     bool _get_frame(cv::Mat* frame) override;