From 2fa34614d038e61e0c37144d95092c169fe2d0cc Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 25 Jul 2017 20:16:04 +0200 Subject: Remove unnecessary tests for touch-state --- libs/surfaces/faderport8/fp8_strip.cc | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'libs/surfaces/faderport8/fp8_strip.cc') diff --git a/libs/surfaces/faderport8/fp8_strip.cc b/libs/surfaces/faderport8/fp8_strip.cc index b811e7c88f..eb6ec244b9 100644 --- a/libs/surfaces/faderport8/fp8_strip.cc +++ b/libs/surfaces/faderport8/fp8_strip.cc @@ -297,9 +297,7 @@ FP8Strip::midi_touch (bool t) return false; } if (t) { - if (!ac->touching ()) { - ac->start_touch (ac->session().transport_frame()); - } + ac->start_touch (ac->session().transport_frame()); } else { ac->stop_touch (ac->session().transport_frame()); } @@ -317,9 +315,7 @@ FP8Strip::midi_fader (float val) if (!ac) { return false; } - if (ac->automation_state() == Touch && !ac->touching ()) { - ac->start_touch (ac->session().transport_frame()); - } + ac->start_touch (ac->session().transport_frame()); ac->set_value (ac->interface_to_internal (val), group_mode ()); return true; } @@ -344,9 +340,7 @@ FP8Strip::set_mute (bool on) if (!_mute_ctrl) { return; } - if (_mute_ctrl->automation_state() == Touch && !_mute_ctrl->touching ()) { - _mute_ctrl->start_touch (_mute_ctrl->session().transport_frame()); - } + _mute_ctrl->start_touch (_mute_ctrl->session().transport_frame()); _mute_ctrl->set_value (on ? 1.0 : 0.0, group_mode ()); } @@ -356,9 +350,7 @@ FP8Strip::set_solo (bool on) if (!_solo_ctrl) { return; } - if (_solo_ctrl->automation_state() == Touch && !_solo_ctrl->touching ()) { - _solo_ctrl->start_touch (_solo_ctrl->session().transport_frame()); - } + _solo_ctrl->start_touch (_solo_ctrl->session().transport_frame()); _solo_ctrl->set_value (on ? 1.0 : 0.0, group_mode ()); } @@ -379,9 +371,7 @@ FP8Strip::set_select () assert (!_x_select_ctrl); _select_plugin_functor (); } else if (_x_select_ctrl) { - if (_x_select_ctrl->automation_state() == Touch && !_x_select_ctrl->touching ()) { - _x_select_ctrl->start_touch (_x_select_ctrl->session().transport_frame()); - } + _x_select_ctrl->start_touch (_x_select_ctrl->session().transport_frame()); const bool on = !select_button ().is_active(); _x_select_ctrl->set_value (on ? 1.0 : 0.0, group_mode ()); } -- cgit v1.2.3