From ce561473cb6ed102a969defe037a65bd3df09d63 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 18 Mar 2019 17:45:29 +0100
Subject: video/opencv: add header

---
 video-opencv/camera-impl.cpp | 48 ++++-------------------------------------
 video-opencv/camera-impl.hpp | 51 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 44 deletions(-)
 create mode 100644 video-opencv/camera-impl.hpp

(limited to 'video-opencv')

diff --git a/video-opencv/camera-impl.cpp b/video-opencv/camera-impl.cpp
index ca18fd4b..c7869ad5 100644
--- a/video-opencv/camera-impl.cpp
+++ b/video-opencv/camera-impl.cpp
@@ -1,52 +1,10 @@
-/* Copyright (c) 2019 Stanislaw Halik <sthalik@misaki.pl>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
-
+#include "camera-impl.hpp"
 #include "compat/sleep.hpp"
-#include "video/camera.hpp"
 
 #include "camera-names.hpp"
 #include "video-property-page.hpp"
 
-#include <optional>
-
-#include <opencv2/core.hpp>
-#include <opencv2/videoio.hpp>
-
-using namespace video::impl;
-
-struct cam;
-
-struct metadata : camera_
-{
-    metadata();
-    std::vector<QString> camera_names() const override;
-    std::unique_ptr<camera> make_camera(const QString& name) override;
-    bool can_show_dialog(const QString& camera_name) override;
-    bool show_dialog(const QString& camera_name) override;
-};
-
-struct cam final : camera
-{
-    cam(int idx);
-    ~cam() override;
-
-    bool start(const info& args) override;
-    void stop() override;
-    bool is_open() override;
-    std::tuple<const frame&, bool> get_frame() override;
-    bool show_dialog() override;
-
-    bool get_frame_();
-
-    std::optional<cv::VideoCapture> cap;
-    cv::Mat mat;
-    frame frame_;
-    int idx = -1;
-};
+namespace opencv_camera_impl {
 
 metadata::metadata() = default;
 
@@ -171,3 +129,5 @@ bool cam::show_dialog()
 }
 
 OTR_REGISTER_CAMERA(metadata)
+
+} // ns opencv_camera_impl
diff --git a/video-opencv/camera-impl.hpp b/video-opencv/camera-impl.hpp
new file mode 100644
index 00000000..f756fb19
--- /dev/null
+++ b/video-opencv/camera-impl.hpp
@@ -0,0 +1,51 @@
+/* Copyright (c) 2019 Stanislaw Halik <sthalik@misaki.pl>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ */
+
+#pragma once
+
+#include "video/camera.hpp"
+
+#include <optional>
+
+#include <opencv2/core.hpp>
+#include <opencv2/videoio.hpp>
+
+namespace opencv_camera_impl {
+
+using namespace video::impl;
+
+struct cam;
+
+struct metadata : camera_
+{
+    metadata();
+    std::vector<QString> camera_names() const override;
+    std::unique_ptr<camera> make_camera(const QString& name) override;
+    bool can_show_dialog(const QString& camera_name) override;
+    bool show_dialog(const QString& camera_name) override;
+};
+
+struct cam final : camera
+{
+    cam(int idx);
+    ~cam() override;
+
+    bool start(const info& args) override;
+    void stop() override;
+    bool is_open() override;
+    std::tuple<const frame&, bool> get_frame() override;
+    bool show_dialog() override;
+
+    bool get_frame_();
+
+    std::optional<cv::VideoCapture> cap;
+    cv::Mat mat;
+    frame frame_;
+    int idx = -1;
+};
+
+} // ns opencv_camera_impl
-- 
cgit v1.2.3