X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fbinarycontrol.h;h=0d71bdc3349e0dc4afedf3a5a9423528ca82977a;hb=bc1a38d6d2c966a6aee74e483ca7a7d37a56909e;hp=851c6127f08006a11731e90ff037bd8b00c79344;hpb=47df97f4381412236a02f0fcf71a2e9b23f78187;p=libs%2Fgui.git

diff --git a/source/input/binarycontrol.h b/source/input/binarycontrol.h
index 851c612..0d71bdc 100644
--- a/source/input/binarycontrol.h
+++ b/source/input/binarycontrol.h
@@ -1,5 +1,5 @@
-#ifndef MSP_GBASE_BINARYCONTROL_H_
-#define MSP_GBASE_BINARYCONTROL_H_
+#ifndef MSP_INPUT_BINARYCONTROL_H_
+#define MSP_INPUT_BINARYCONTROL_H_
 
 #include "control.h"
 
@@ -18,24 +18,27 @@ public:
 	sigc::signal<void> signal_release;
 
 private:
-	bool state;
-	float threshold;
+	bool state = false;
+	float threshold = 0.5f;
 
 public:
-	BinaryControl();
+	BinaryControl() = default;
 	BinaryControl(const ControlSource &);
 	BinaryControl(Device &, ControlSrcType, unsigned);
+	~BinaryControl();
 
 	/** Sets the threshold between states for axis sources.  No effect on button
 	sources */
 	void set_threshold(float);
 
 	bool get_state() const { return state; }
+	bool was_pressed() const { return rising_edge; }
+	bool was_released() const { return falling_edge; }
 
 private:
-	virtual void on_press();
-	virtual void on_release();
-	virtual void on_motion(float, float);
+	void on_press() override;
+	void on_release() override;
+	void on_motion(float, float) override;
 };
 
 } // namespace Input