From fde0e293a30ed4e689208b456a4431b7bb278eb4 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 24 Jul 2017 01:22:50 +0200 Subject: Remove unused "mark" parameter from stop_touch() API --- gtk2_ardour/automation_controller.cc | 15 +-------------- gtk2_ardour/gain_meter.cc | 2 +- gtk2_ardour/lv2_plugin_ui.cc | 2 +- gtk2_ardour/panner_ui.cc | 2 +- gtk2_ardour/processor_box.cc | 2 +- gtk2_ardour/route_ui.cc | 2 +- libs/ardour/ardour/automation_control.h | 2 +- libs/ardour/ardour/automation_list.h | 2 +- libs/ardour/ardour/pannable.h | 2 +- libs/ardour/automatable.cc | 2 +- libs/ardour/automation_control.cc | 5 ++--- libs/ardour/automation_list.cc | 12 +----------- libs/ardour/automation_watch.cc | 2 +- libs/ardour/lv2_plugin.cc | 2 +- libs/ardour/pannable.cc | 4 ++-- libs/ardour/plugin_insert.cc | 2 +- libs/surfaces/cc121/cc121.cc | 2 +- libs/surfaces/faderport/faderport.cc | 2 +- libs/surfaces/faderport8/fp8_strip.cc | 2 +- libs/surfaces/mackie/controls.cc | 4 ++-- libs/surfaces/mackie/controls.h | 2 +- libs/surfaces/mackie/mcp_buttons.cc | 2 +- libs/surfaces/mackie/strip.cc | 4 ++-- libs/surfaces/osc/osc.cc | 4 ++-- libs/surfaces/push2/mix.cc | 2 +- libs/surfaces/push2/push2.cc | 2 +- libs/surfaces/push2/track_mix.cc | 2 +- 27 files changed, 32 insertions(+), 56 deletions(-) diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index c151b72d14..d53c61432e 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -200,20 +200,7 @@ AutomationController::start_touch() void AutomationController::end_touch () { - if (_controllable->automation_state() == Touch) { - - bool mark = false; - double when = 0; - - if (_controllable->session().transport_rolling()) { - mark = true; - when = _controllable->session().transport_frame(); - } - - _controllable->stop_touch (mark, when); - } else { - _controllable->stop_touch (false, _controllable->session().transport_frame()); - } + _controllable->stop_touch (_controllable->session().transport_frame()); } bool diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index ab90de8862..0b063ff886 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -737,7 +737,7 @@ GainMeterBase::amp_start_touch () void GainMeterBase::amp_stop_touch () { - _control->stop_touch (false, _control->session().transport_frame()); + _control->stop_touch (_control->session().transport_frame()); effective_gain_display (); } diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc index 7f735dfcc5..d7f6708d00 100644 --- a/gtk2_ardour/lv2_plugin_ui.cc +++ b/gtk2_ardour/lv2_plugin_ui.cc @@ -105,7 +105,7 @@ LV2PluginUI::touch(void* controller, if (grabbed) { control->start_touch(control->session().transport_frame()); } else { - control->stop_touch(false, control->session().transport_frame()); + control->stop_touch(control->session().transport_frame()); } } diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 0fd588dfdf..a394932306 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -352,7 +352,7 @@ PannerUI::stop_touch (boost::weak_ptr wac) if (!ac) { return; } - ac->stop_touch (false, ac->session().transport_frame()); + ac->stop_touch (ac->session().transport_frame()); } bool diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 8b353c040e..3e39e639f2 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -921,7 +921,7 @@ ProcessorEntry::Control::end_touch () if (!c) { return; } - c->stop_touch (true, c->session().transport_frame()); + c->stop_touch (c->session().transport_frame()); } void diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index a935ec3c5d..d2707f5476 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -531,7 +531,7 @@ RouteUI::mute_release (GdkEventButton* /*ev*/) _mute_release = 0; } - _route->mute_control()->stop_touch (false, _session->audible_frame ()); + _route->mute_control()->stop_touch (_session->audible_frame ()); return false; } diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h index 0ac4a08c7b..6ffcb3b866 100644 --- a/libs/ardour/ardour/automation_control.h +++ b/libs/ardour/ardour/automation_control.h @@ -84,7 +84,7 @@ public: void set_automation_state(AutoState as); void start_touch(double when); - void stop_touch(bool mark, double when); + void stop_touch(double when); /* inherited from PBD::Controllable. */ virtual double get_value () const; diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h index 9810275ed1..65268d503a 100644 --- a/libs/ardour/ardour/automation_list.h +++ b/libs/ardour/ardour/automation_list.h @@ -103,7 +103,7 @@ public: void write_pass_finished (double when, double thinning_factor=0.0); void start_touch (double when); - void stop_touch (bool mark, double when); + void stop_touch (double when); bool touching() const { return g_atomic_int_get (const_cast(&_touching)); } bool writing() const { return _state == Write; } bool touch_enabled() const { return _state == Touch; } diff --git a/libs/ardour/ardour/pannable.h b/libs/ardour/ardour/pannable.h index bdac270891..cd88a250cf 100644 --- a/libs/ardour/ardour/pannable.h +++ b/libs/ardour/ardour/pannable.h @@ -67,7 +67,7 @@ class LIBARDOUR_API Pannable : public PBD::Stateful, public Automatable, public std::string value_as_string (boost::shared_ptr) const; void start_touch (double when); - void stop_touch (bool mark, double when); + void stop_touch (double when); bool touching() const { return g_atomic_int_get (const_cast(&_touching)); } bool writing() const { return _auto_state == Write; } bool touch_enabled() const { return _auto_state == Touch; } diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc index 19678ec19c..a8f755da5e 100644 --- a/libs/ardour/automatable.cc +++ b/libs/ardour/automatable.cc @@ -379,7 +379,7 @@ Automatable::non_realtime_transport_stop (framepos_t now, bool /*flush_processor */ const bool list_did_write = !l->in_new_write_pass (); - l->stop_touch (true, now); + l->stop_touch (now); c->commit_transaction (list_did_write); diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc index c3ad2481d6..274e84f9f0 100644 --- a/libs/ardour/automation_control.cc +++ b/libs/ardour/automation_control.cc @@ -291,17 +291,16 @@ AutomationControl::start_touch(double when) } void -AutomationControl::stop_touch(bool mark, double when) +AutomationControl::stop_touch(double when) { if (!_list) return; if (touching()) { set_touching (false); if (alist()->automation_state() == Touch) { - alist()->stop_touch (mark, when); + alist()->stop_touch (when); if (!_desc.toggled) { AutomationWatch::instance().remove_automation_watch (shared_from_this()); - } } } diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index 27bc64462e..74181d5514 100644 --- a/libs/ardour/automation_list.cc +++ b/libs/ardour/automation_list.cc @@ -257,7 +257,7 @@ AutomationList::start_touch (double when) } void -AutomationList::stop_touch (bool mark, double) +AutomationList::stop_touch (double) { if (g_atomic_int_get (&_touching) == 0) { /* this touch has already been stopped (probably by Automatable::transport_stopped), @@ -267,16 +267,6 @@ AutomationList::stop_touch (bool mark, double) } g_atomic_int_set (&_touching, 0); - - if (_state == Touch) { - - if (mark) { - - /* XXX need to mark the last added point with the - * current time - */ - } - } } /* _before may be owned by the undo stack, diff --git a/libs/ardour/automation_watch.cc b/libs/ardour/automation_watch.cc index d1118e7669..a7a7a36eed 100644 --- a/libs/ardour/automation_watch.cc +++ b/libs/ardour/automation_watch.cc @@ -138,7 +138,7 @@ AutomationWatch::transport_stop_automation_watches (framepos_t when) } for (AutomationWatches::iterator i = tmp.begin(); i != tmp.end(); ++i) { - (*i)->stop_touch (true, when); + (*i)->stop_touch (when); } } diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc index d1cf26f266..2911c6c763 100644 --- a/libs/ardour/lv2_plugin.cc +++ b/libs/ardour/lv2_plugin.cc @@ -2811,7 +2811,7 @@ LV2Plugin::connect_and_run(BufferSet& bufs, AutomationCtrlPtr c = get_automation_control (p); DEBUG_TRACE(DEBUG::LV2Automate, string_compose ("End Touch p: %1\n", p)); if (c) { - c->ac->stop_touch (true, std::max ((framepos_t)0, start - _current_latency)); + c->ac->stop_touch (std::max ((framepos_t)0, start - _current_latency)); } } } diff --git a/libs/ardour/pannable.cc b/libs/ardour/pannable.cc index 1298b85d90..32bf2fe33f 100644 --- a/libs/ardour/pannable.cc +++ b/libs/ardour/pannable.cc @@ -150,14 +150,14 @@ Pannable::start_touch (double when) } void -Pannable::stop_touch (bool mark, double when) +Pannable::stop_touch (double when) { const Controls& c (controls()); for (Controls::const_iterator ci = c.begin(); ci != c.end(); ++ci) { boost::shared_ptr ac = boost::dynamic_pointer_cast(ci->second); if (ac) { - ac->alist()->stop_touch (mark, when); + ac->alist()->stop_touch (when); } } g_atomic_int_set (&_touching, 0); diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc index 7c9c71ccf0..762b87149e 100644 --- a/libs/ardour/plugin_insert.cc +++ b/libs/ardour/plugin_insert.cc @@ -3078,7 +3078,7 @@ PluginInsert::end_touch (uint32_t param_id) boost::shared_ptr ac = automation_control (Evoral::Parameter (PluginAutomation, 0, param_id)); if (ac) { // ToDo subtract _plugin_signal_latency from audible_frame() when rolling, assert > 0 - ac->stop_touch (true, session().audible_frame()); + ac->stop_touch (session().audible_frame()); } } diff --git a/libs/surfaces/cc121/cc121.cc b/libs/surfaces/cc121/cc121.cc index 19301b86b8..b00fbbb541 100644 --- a/libs/surfaces/cc121/cc121.cc +++ b/libs/surfaces/cc121/cc121.cc @@ -364,7 +364,7 @@ CC121::button_release_handler (MIDI::Parser &, MIDI::EventTwoBytes* tb) boost::shared_ptr gain = _current_stripable->gain_control (); if (gain) { framepos_t now = session->engine().sample_time(); - gain->stop_touch (true, now); + gain->stop_touch (now); } } break; diff --git a/libs/surfaces/faderport/faderport.cc b/libs/surfaces/faderport/faderport.cc index 8e106c7948..4e65fec3cc 100644 --- a/libs/surfaces/faderport/faderport.cc +++ b/libs/surfaces/faderport/faderport.cc @@ -379,7 +379,7 @@ FaderPort::button_handler (MIDI::Parser &, MIDI::EventTwoBytes* tb) if (tb->value) { gain->start_touch (now); } else { - gain->stop_touch (true, now); + gain->stop_touch (now); } } } diff --git a/libs/surfaces/faderport8/fp8_strip.cc b/libs/surfaces/faderport8/fp8_strip.cc index f1d6176829..b811e7c88f 100644 --- a/libs/surfaces/faderport8/fp8_strip.cc +++ b/libs/surfaces/faderport8/fp8_strip.cc @@ -301,7 +301,7 @@ FP8Strip::midi_touch (bool t) ac->start_touch (ac->session().transport_frame()); } } else { - ac->stop_touch (true, ac->session().transport_frame()); + ac->stop_touch (ac->session().transport_frame()); } return true; } diff --git a/libs/surfaces/mackie/controls.cc b/libs/surfaces/mackie/controls.cc index aa7112a7ec..7a74fc451e 100644 --- a/libs/surfaces/mackie/controls.cc +++ b/libs/surfaces/mackie/controls.cc @@ -104,10 +104,10 @@ Control::start_touch (double when) } void -Control::stop_touch (bool mark, double when) +Control::stop_touch (double when) { if (normal_ac) { - return normal_ac->stop_touch (mark, when); + return normal_ac->stop_touch (when); } } diff --git a/libs/surfaces/mackie/controls.h b/libs/surfaces/mackie/controls.h index c53be76891..e5d723a7d1 100644 --- a/libs/surfaces/mackie/controls.h +++ b/libs/surfaces/mackie/controls.h @@ -74,7 +74,7 @@ public: void set_value (float val, PBD::Controllable::GroupControlDisposition gcd = PBD::Controllable::UseGroup); virtual void start_touch (double when); - virtual void stop_touch (bool mark, double when); + virtual void stop_touch (double when); protected: boost::shared_ptr normal_ac; diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc index 3bdf51c4b9..a8998f960d 100644 --- a/libs/surfaces/mackie/mcp_buttons.cc +++ b/libs/surfaces/mackie/mcp_buttons.cc @@ -852,7 +852,7 @@ MackieControlProtocol::master_fader_touch_release (Mackie::Button &) Fader* master_fader = _master_surface->master_fader(); master_fader->set_in_use (false); - master_fader->stop_touch (transport_frame(), true); + master_fader->stop_touch (transport_frame()); return none; } diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index 87e078d639..de9aa89c8a 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -799,7 +799,7 @@ Strip::fader_touch_event (Button&, ButtonState bs) } else { _fader->set_in_use (false); - _fader->stop_touch (_surface->mcp().transport_frame(), true); + _fader->stop_touch (_surface->mcp().transport_frame()); } } @@ -949,7 +949,7 @@ Strip::handle_fader_touch (Fader& fader, bool touch_on) if (touch_on) { fader.start_touch (_surface->mcp().transport_frame()); } else { - fader.stop_touch (_surface->mcp().transport_frame(), false); + fader.stop_touch (_surface->mcp().transport_frame()); } } diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 84c8b47e74..dfe87bbcca 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -2838,7 +2838,7 @@ OSC::touch_detect (const char *path, const char* types, lo_arg **argv, int argc, ret = 0; } else { // end touch - control->stop_touch (true, control->session().transport_frame()); + control->stop_touch (control->session().transport_frame()); ret = 0; } // just in case some crazy surface starts sending control values before touch @@ -4844,7 +4844,7 @@ OSC::periodic (void) if (!(*x).second) { boost::shared_ptr ctrl = (*x).first; // turn touch off - ctrl->stop_touch (true, ctrl->session().transport_frame()); + ctrl->stop_touch (ctrl->session().transport_frame()); _touch_timeout.erase (x++); } else { x++; diff --git a/libs/surfaces/push2/mix.cc b/libs/surfaces/push2/mix.cc index fb2bfd222f..f012e91673 100644 --- a/libs/surfaces/push2/mix.cc +++ b/libs/surfaces/push2/mix.cc @@ -437,7 +437,7 @@ MixLayout::strip_vpot_touch (int n, bool touching) if (touching) { ac->start_touch (session.audible_frame()); } else { - ac->stop_touch (true, session.audible_frame()); + ac->stop_touch (session.audible_frame()); } } } diff --git a/libs/surfaces/push2/push2.cc b/libs/surfaces/push2/push2.cc index 7b9a348841..f29ff41d06 100644 --- a/libs/surfaces/push2/push2.cc +++ b/libs/surfaces/push2/push2.cc @@ -1082,7 +1082,7 @@ Push2::other_vpot_touch (int n, bool touching) if (touching) { ac->start_touch (session->audible_frame()); } else { - ac->stop_touch (true, session->audible_frame()); + ac->stop_touch (session->audible_frame()); } } } diff --git a/libs/surfaces/push2/track_mix.cc b/libs/surfaces/push2/track_mix.cc index ed4c9c3aa3..a12ca84cf0 100644 --- a/libs/surfaces/push2/track_mix.cc +++ b/libs/surfaces/push2/track_mix.cc @@ -572,7 +572,7 @@ TrackMixLayout::strip_vpot_touch (int n, bool touching) if (touching) { ac->start_touch (session.audible_frame()); } else { - ac->stop_touch (true, session.audible_frame()); + ac->stop_touch (session.audible_frame()); } } } -- cgit v1.2.3