diff options
author | mrsanchos <orokhovatskiy@gmail.com> | 2018-02-16 21:05:36 +0300 |
---|---|---|
committer | mrsanchos <orokhovatskiy@gmail.com> | 2018-02-16 21:05:36 +0300 |
commit | b52fd95f1cc86e86ecb696eab07c8d6b6a2e9f5d (patch) | |
tree | a8d5a8c98d8ca3b60b0805504049275a3311f59b /tracker-wii/wii_camera.h | |
parent | 82c43da829fdac974b3d6adb8742715382ddd051 (diff) | |
parent | 7a973ae2ad396c8413405e40bcb2eaab67c95d15 (diff) |
Merge branch 'unstable' of https://github.com/opentrack/opentrack into unstable
Diffstat (limited to 'tracker-wii/wii_camera.h')
-rw-r--r-- | tracker-wii/wii_camera.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tracker-wii/wii_camera.h b/tracker-wii/wii_camera.h index d0d7f6dd..55def206 100644 --- a/tracker-wii/wii_camera.h +++ b/tracker-wii/wii_camera.h @@ -29,8 +29,9 @@ namespace pt_module { struct WIICamera final : pt_camera { WIICamera(const QString& module_name); + ~WIICamera() override; - pt_camera_open_status start(int idx, int fps, int res_x, int res_y) override; + bool start(int idx, int fps, int res_x, int res_y) override; void stop() override; result get_frame(pt_frame& Frame) override; @@ -40,12 +41,9 @@ struct WIICamera final : pt_camera QString get_desired_name() const override; QString get_active_name() const override; - operator bool() const override { return m_pDev && (!m_pDev->ConnectionLost()); } - void set_fov(double value) override {} void show_camera_settings() override; - private: std::unique_ptr<wiimote> m_pDev; static void on_state_change(wiimote &remote, |