X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fsmoothcontrol.cpp;h=0532aef68ca66d62dc6d38808da0a08c07529eb9;hb=27356249e3607c78f5da9823c88703a6f4f7bed1;hp=c9d0a3c5d69b8b3b0cce4e7720ca9a4303c6c0bb;hpb=30cab36b531f6efddca07c3fe9a6b1b81ca42bde;p=libs%2Fgui.git diff --git a/source/input/smoothcontrol.cpp b/source/input/smoothcontrol.cpp index c9d0a3c..0532aef 100644 --- a/source/input/smoothcontrol.cpp +++ b/source/input/smoothcontrol.cpp @@ -6,32 +6,17 @@ using namespace std; namespace Msp { namespace Input { -SmoothControl::SmoothControl(): - value(0), - paired_ctrl(0), - dead_zone(0.1), - threshold(0.9) -{ } - SmoothControl::SmoothControl(const ControlSource &s): - Control(s), - value(0), - paired_ctrl(0), - dead_zone(0.1), - threshold(0.9) + Control(s) { } SmoothControl::SmoothControl(Device &d, ControlSrcType t, unsigned i): - Control(d, t, i), - value(0), - paired_ctrl(0), - dead_zone(0.1), - threshold(0.9) + Control(d, t, i) { } SmoothControl::~SmoothControl() { - pair(0); + pair(nullptr); } void SmoothControl::set_dead_zone(float d) @@ -64,8 +49,8 @@ void SmoothControl::pair(SmoothControl *ctrl) if(paired_ctrl) { SmoothControl *old_pair = paired_ctrl; - paired_ctrl = 0; - old_pair->pair(0); + paired_ctrl = nullptr; + old_pair->pair(nullptr); } paired_ctrl = ctrl;