Use default member initializers and defaulted default constructors

[libs/gui.git] / source / input / binarycontrol.h

diff --git a/source/input/binarycontrol.h b/source/input/binarycontrol.h
index 851c6127f08006a11731e90ff037bd8b00c79344..0d71bdc3349e0dc4afedf3a5a9423528ca82977a 100644 (file)
--- 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