1 files changed, 20 insertions, 28 deletions

diff --git a/tracker-wii/wii_camera.h b/tracker-wii/wii_camera.h
index 55def206..3a7993aa 100644
--- a/tracker-wii/wii_camera.h
+++ b/tracker-wii/wii_camera.h
@@ -17,7 +17,6 @@
 #include <tuple>
 
 #include <opencv2/core.hpp>
-#include <opencv2/videoio.hpp>
 
 #include <QString>
 
@@ -28,46 +27,39 @@ namespace pt_module {
 
 struct WIICamera final : pt_camera
 {
-    WIICamera(const QString& module_name);
-    ~WIICamera() override;
+	WIICamera(const QString& module_name);
+	~WIICamera() override;
 
-    bool start(int idx, int fps, int res_x, int res_y) override;
-    void stop() override;
+	bool start(const pt_settings&) override;
+	void stop() override;
 
-    result get_frame(pt_frame& Frame) override;
-    result get_info() const override;
+	result get_frame(pt_frame& Frame) override;
+	result get_info() const override;
 
-    pt_camera_info get_desired() const override { return cam_desired; }
-    QString get_desired_name() const override;
-    QString get_active_name() const override;
+	pt_camera_info get_desired() const override { return cam_desired; }
+	QString get_desired_name() const override;
+	QString get_active_name() const override;
 
-    void set_fov(double value) override {}
-    void show_camera_settings() override;
+	void set_fov(f x) override { (void) x; }
+	void show_camera_settings() override;
 
 private:
 	std::unique_ptr<wiimote> m_pDev;
 	static void on_state_change(wiimote &remote,
 		state_change_flags changed,
 		const wiimote_state &new_state);
-	bool onExit = false;
-	pt_frame internalframe;
-	
-	wii_camera_status _pair();
-	wii_camera_status _get_frame(cv::Mat& Frame);
-	bool _get_points(struct wii_info&);
-	void _get_status(struct wii_info&);
 
-    double dt_mean = 0;
+	wii_camera_status pair();
+	wii_camera_status get_frame(cv::Mat& Frame);
+	bool get_points(struct wii_info& wii);
+	void get_status(struct wii_info& wii);
 
-    Timer t;
+	pt_camera_info cam_info;
+	pt_camera_info cam_desired;
+	int pitch_ = 0, roll_ = 0;
+	pt_settings s;
 
-    pt_camera_info cam_info;
-    pt_camera_info cam_desired;
-    QString desired_name, active_name;
-
-    pt_settings s;
-
-    static constexpr inline double dt_eps = 1./384;
+	static constexpr inline double dt_eps = 1./384;
 };
 
 } // ns pt_module