smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused "mark" parameter from stop_touch() API

Browse source
This commit is contained in:
Robin Gareus 2017-07-24 01:22:50 +02:00
parent f04bacdfac
commit fde0e293a3
27 changed files with 32 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gtk2_ardour/automation_controller.cc
View file

@ -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

2
gtk2_ardour/gain_meter.cc
View file

@ -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 ();
}

2
gtk2_ardour/lv2_plugin_ui.cc
View file

@ -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());
}
}

2
gtk2_ardour/panner_ui.cc
View file

@ -352,7 +352,7 @@ PannerUI::stop_touch (boost::weak_ptr<AutomationControl> wac)
if (!ac) {
return;
}
ac->stop_touch (false, ac->session().transport_frame());
ac->stop_touch (ac->session().transport_frame());
}
bool

2
gtk2_ardour/processor_box.cc
View file

@ -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

2
gtk2_ardour/route_ui.cc
View file

@ -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;
}

2
libs/ardour/ardour/automation_control.h
View file

@ -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;

2
libs/ardour/ardour/automation_list.h
View file

@ -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<gint*>(&_touching)); }
bool writing() const { return _state == Write; }
bool touch_enabled() const { return _state == Touch; }

2
libs/ardour/ardour/pannable.h
View file

@ -67,7 +67,7 @@ class LIBARDOUR_API Pannable : public PBD::Stateful, public Automatable, public
std::string value_as_string (boost::shared_ptr<const AutomationControl>) 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<gint*>(&_touching)); }
bool writing() const { return _auto_state == Write; }
bool touch_enabled() const { return _auto_state == Touch; }

2
libs/ardour/automatable.cc
View file

@ -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);

5
libs/ardour/automation_control.cc
View file

@ -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());
}
}
}

12
libs/ardour/automation_list.cc
View file

@ -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,

2
libs/ardour/automation_watch.cc
View file

@ -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);
}
}

2
libs/ardour/lv2_plugin.cc
View file

@ -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));
}
}
}

4
libs/ardour/pannable.cc
View file

@ -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<AutomationControl> ac = boost::dynamic_pointer_cast<AutomationControl>(ci->second);
if (ac) {
ac->alist()->stop_touch (mark, when);
ac->alist()->stop_touch (when);
}
}
g_atomic_int_set (&_touching, 0);

2
libs/ardour/plugin_insert.cc
View file

@ -3078,7 +3078,7 @@ PluginInsert::end_touch (uint32_t param_id)
boost::shared_ptr<AutomationControl> 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());
}
}

2
libs/surfaces/cc121/cc121.cc
View file

@ -364,7 +364,7 @@ CC121::button_release_handler (MIDI::Parser &, MIDI::EventTwoBytes* tb)
boost::shared_ptr<AutomationControl> gain = _current_stripable->gain_control ();
if (gain) {
framepos_t now = session->engine().sample_time();
gain->stop_touch (true, now);
gain->stop_touch (now);
}
}
break;

2
libs/surfaces/faderport/faderport.cc
View file

@ -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);
}
}
}

2
libs/surfaces/faderport8/fp8_strip.cc
View file

@ -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;
}

4
libs/surfaces/mackie/controls.cc
View file

@ -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);
}
}

2
libs/surfaces/mackie/controls.h
View file

@ -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<ARDOUR::AutomationControl> normal_ac;

2
libs/surfaces/mackie/mcp_buttons.cc
View file

@ -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;
}

4
libs/surfaces/mackie/strip.cc
View file

@ -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());
}
}

4
libs/surfaces/osc/osc.cc
View file

@ -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<ARDOUR::AutomationControl> 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++;

2
libs/surfaces/push2/mix.cc
View file

@ -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());
}
}
}

2
libs/surfaces/push2/push2.cc
View file

@ -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());
}
}
}

2
libs/surfaces/push2/track_mix.cc
View file

@ -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());
}
}
}