diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h index 2974b7ea35..13f8009fd3 100644 --- a/libs/ardour/ardour/automatable.h +++ b/libs/ardour/ardour/automatable.h @@ -125,7 +125,7 @@ protected: void can_automate(Evoral::Parameter); virtual void automation_list_automation_state_changed (Evoral::Parameter const&, AutoState); - SerializedRCUManager _automated_controls; + SerializedRCUManager _automated_controls; int load_automation (const std::string& path); int old_set_automation_state(const XMLNode&); @@ -134,7 +134,7 @@ protected: samplepos_t _last_automation_snapshot; - SlavableControlList slavables () const { return SlavableControlList(); } + SlavableAutomationControlList slavables () const { return SlavableAutomationControlList(); } void find_next_ac_event (std::shared_ptr, Temporal::timepos_t const & start, Temporal::timepos_t const & end, Evoral::ControlEvent& ev) const; void find_prev_ac_event (std::shared_ptr, Temporal::timepos_t const & start, Temporal::timepos_t const & end, Evoral::ControlEvent& ev) const; diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h index b63ff886fa..26537b0e46 100644 --- a/libs/ardour/ardour/automation_control.h +++ b/libs/ardour/ardour/automation_control.h @@ -122,7 +122,7 @@ public: const ARDOUR::Session& session() const { return _session; } void commit_transaction (bool did_write); - ControlList grouped_controls () const; + AutomationControlList grouped_controls () const; protected: std::shared_ptr _group; diff --git a/libs/ardour/ardour/control_group.h b/libs/ardour/ardour/control_group.h index 76f3292915..b053ce063e 100644 --- a/libs/ardour/ardour/control_group.h +++ b/libs/ardour/ardour/control_group.h @@ -56,7 +56,7 @@ class LIBARDOUR_API ControlGroup : public std::enable_shared_from_this the_instrument_unlocked() const; - SlavableControlList slavables () const; + SlavableAutomationControlList slavables () const; private: /* no copy construction */ diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index c80de9b6fd..d90f5ca887 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -972,7 +972,7 @@ public: /* Control-based methods */ - void set_controls (std::shared_ptr, double val, PBD::Controllable::GroupControlDisposition); + void set_controls (std::shared_ptr, double val, PBD::Controllable::GroupControlDisposition); void set_control (std::shared_ptr, double val, PBD::Controllable::GroupControlDisposition); void set_exclusive_input_active (std::shared_ptr rt, bool onoff, bool flip_others = false); @@ -2259,7 +2259,7 @@ private: } /* specialized version realtime "apply to set of controls" operations */ - SessionEvent* get_rt_event (std::shared_ptr cl, double arg, PBD::Controllable::GroupControlDisposition group_override) { + SessionEvent* get_rt_event (std::shared_ptr cl, double arg, PBD::Controllable::GroupControlDisposition group_override) { SessionEvent* ev = new SessionEvent (SessionEvent::RealTimeOperation, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0); ev->rt_slot = boost::bind (&Session::rt_set_controls, this, cl, arg, group_override); ev->rt_return = Session::rt_cleanup; @@ -2268,7 +2268,7 @@ private: return ev; } - void rt_set_controls (std::shared_ptr, double val, PBD::Controllable::GroupControlDisposition group_override); + void rt_set_controls (std::shared_ptr, double val, PBD::Controllable::GroupControlDisposition group_override); void rt_clear_all_solo_state (std::shared_ptr, bool yn, PBD::Controllable::GroupControlDisposition group_override); void setup_midi_machine_control (); diff --git a/libs/ardour/ardour/session_event.h b/libs/ardour/ardour/session_event.h index 3aa5232d7c..421990c82d 100644 --- a/libs/ardour/ardour/session_event.h +++ b/libs/ardour/ardour/session_event.h @@ -110,7 +110,7 @@ public: typedef boost::function RTeventCallback; - std::shared_ptr controls; /* apply to */ + std::shared_ptr controls; /* apply to */ std::shared_ptr routes; /* apply to */ boost::function rt_slot; /* what to call in RT context */ RTeventCallback rt_return; /* called after rt_slot, with this event as an argument */ diff --git a/libs/ardour/ardour/slavable.h b/libs/ardour/ardour/slavable.h index 3f613c594d..df21ca1743 100644 --- a/libs/ardour/ardour/slavable.h +++ b/libs/ardour/ardour/slavable.h @@ -69,7 +69,7 @@ public: bool assigned_to (VCAManager*, std::shared_ptr) const; protected: - virtual SlavableControlList slavables () const = 0; + virtual SlavableAutomationControlList slavables () const = 0; private: bool assign_controls (std::shared_ptr); diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 45c2b53e6d..bd9179d544 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -655,9 +655,9 @@ typedef std::list > GraphNodeList; typedef std::list > StripableList; typedef std::list > WeakRouteList; typedef std::list > WeakStripableList; -typedef std::list > ControlList; -typedef std::list > WeakControlList; -typedef std::list > SlavableControlList; +typedef std::list > AutomationControlList; +typedef std::list > WeakAutomationControlList; +typedef std::list > SlavableAutomationControlList; typedef std::set AutomationTypeSet; typedef std::list > VCAList; diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h index e549d81862..e180ae510d 100644 --- a/libs/ardour/ardour/utils.h +++ b/libs/ardour/ardour/utils.h @@ -112,8 +112,8 @@ LIBARDOUR_API uint32_t how_many_dsp_threads (); LIBARDOUR_API std::string compute_sha1_of_file (std::string path); -template std::shared_ptr route_list_to_control_list (std::shared_ptr rl, std::shared_ptr (Stripable::*get_control)() const) { - std::shared_ptr cl (new ControlList); +template std::shared_ptr route_list_to_control_list (std::shared_ptr rl, std::shared_ptr (Stripable::*get_control)() const) { + std::shared_ptr cl (new AutomationControlList); if (!rl) { return cl; } for (auto const& r : *rl) { std::shared_ptr ac = (r.get()->*get_control)(); diff --git a/libs/ardour/ardour/vca.h b/libs/ardour/ardour/vca.h index e0a930fd11..ae4b0c052f 100644 --- a/libs/ardour/ardour/vca.h +++ b/libs/ardour/ardour/vca.h @@ -178,7 +178,7 @@ class LIBARDOUR_API VCA : public Stripable, std::shared_ptr filter_enable_controllable () const { return std::shared_ptr(); } protected: - SlavableControlList slavables () const; + SlavableAutomationControlList slavables () const; private: int32_t _number; diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc index 28d021fe84..7621fabf66 100644 --- a/libs/ardour/automatable.cc +++ b/libs/ardour/automatable.cc @@ -62,7 +62,7 @@ const string Automatable::xml_node_name = X_("Automation"); Automatable::Automatable(Session& session, Temporal::TimeDomain td) : ControlSet () , _a_session(session) - , _automated_controls (new ControlList ()) + , _automated_controls (new AutomationControlList ()) , _time_domain (td) { } @@ -71,7 +71,7 @@ Automatable::Automatable (const Automatable& other) : ControlSet (other) , Slavable () , _a_session (other._a_session) - , _automated_controls (new ControlList) + , _automated_controls (new AutomationControlList) { Glib::Threads::Mutex::Lock lm (other._control_lock); @@ -84,8 +84,8 @@ Automatable::Automatable (const Automatable& other) Automatable::~Automatable () { { - RCUWriter writer (_automated_controls); - std::shared_ptr cl = writer.get_copy (); + RCUWriter writer (_automated_controls); + std::shared_ptr cl = writer.get_copy (); cl->clear (); } _automated_controls.flush (); @@ -478,8 +478,8 @@ void Automatable::automation_run (samplepos_t start, pframes_t nframes, bool only_active) { if (only_active) { - std::shared_ptr cl = _automated_controls.reader (); - for (ControlList::const_iterator ci = cl->begin(); ci != cl->end(); ++ci) { + std::shared_ptr cl = _automated_controls.reader (); + for (AutomationControlList::const_iterator ci = cl->begin(); ci != cl->end(); ++ci) { (*ci)->automation_run (start, nframes); } return; @@ -502,10 +502,10 @@ Automatable::automation_list_automation_state_changed (Evoral::Parameter const& std::shared_ptr c (automation_control(param)); assert (c && c->list()); - RCUWriter writer (_automated_controls); - std::shared_ptr cl = writer.get_copy (); + RCUWriter writer (_automated_controls); + std::shared_ptr cl = writer.get_copy (); - ControlList::iterator fi = std::find (cl->begin(), cl->end(), c); + AutomationControlList::iterator fi = std::find (cl->begin(), cl->end(), c); if (fi != cl->end()) { cl->erase (fi); } @@ -663,8 +663,8 @@ Automatable::find_next_event (timepos_t const & start, timepos_t const & end, Ev next_event.when = start <= end ? timepos_t::max (start.time_domain()) : timepos_t (start.time_domain()); if (only_active) { - std::shared_ptr cl = _automated_controls.reader (); - for (ControlList::const_iterator ci = cl->begin(); ci != cl->end(); ++ci) { + std::shared_ptr cl = _automated_controls.reader (); + for (AutomationControlList::const_iterator ci = cl->begin(); ci != cl->end(); ++ci) { if ((*ci)->automation_playback()) { if (start <= end) { find_next_ac_event (*ci, start, end, next_event); diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc index c056837619..3fc0492946 100644 --- a/libs/ardour/automation_control.cc +++ b/libs/ardour/automation_control.cc @@ -153,13 +153,13 @@ AutomationControl::set_value (double val, PBD::Controllable::GroupControlDisposi } } -ControlList +AutomationControlList AutomationControl::grouped_controls () const { if (_group && _group->use_me (PBD::Controllable::UseGroup)) { return _group->controls (); } else { - return ControlList (); + return AutomationControlList (); } } diff --git a/libs/ardour/control_group.cc b/libs/ardour/control_group.cc index adbf01a816..cafb9a13cc 100644 --- a/libs/ardour/control_group.cc +++ b/libs/ardour/control_group.cc @@ -86,10 +86,10 @@ ControlGroup::clear (bool pop) } } -ControlList +AutomationControlList ControlGroup::controls () const { - ControlList c; + AutomationControlList c; if (_active) { Glib::Threads::RWLock::WriterLock lm (controls_lock); diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc index dd3eee5f29..9ed1403d4d 100644 --- a/libs/ardour/plugin_insert.cc +++ b/libs/ardour/plugin_insert.cc @@ -923,8 +923,8 @@ PluginInsert::connect_and_run (BufferSet& bufs, samplepos_t start, samplepos_t e bufs.set_count(ChanCount::max(bufs.count(), _configured_out)); if (with_auto) { - std::shared_ptr cl = _automated_controls.reader (); - for (ControlList::const_iterator ci = cl->begin(); ci != cl->end(); ++ci) { + std::shared_ptr cl = _automated_controls.reader (); + for (AutomationControlList::const_iterator ci = cl->begin(); ci != cl->end(); ++ci) { AutomationControl& c = *(ci->get()); std::shared_ptr clist (c.list()); /* we still need to check for Touch and Latch */ diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 521291067e..a94d984d59 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -6139,10 +6139,10 @@ Route::automatables (PBD::ControllableSet& s) const } } -SlavableControlList +SlavableAutomationControlList Route::slavables () const { - SlavableControlList rv; + SlavableAutomationControlList rv; rv.push_back (_gain_control); rv.push_back (_mute_control); rv.push_back (_solo_control); diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index a0320a4014..e47ea3bacd 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -3986,7 +3986,7 @@ Session::cancel_all_mute () StripableList all; get_stripables (all); std::vector > muted; - std::shared_ptr cl (new ControlList); + std::shared_ptr cl (new AutomationControlList); for (StripableList::const_iterator i = all.begin(); i != all.end(); ++i) { assert (!(*i)->is_auditioner()); if ((*i)->is_monitor()) { diff --git a/libs/ardour/session_rtevents.cc b/libs/ardour/session_rtevents.cc index 9f3d01cd8b..ca6325d675 100644 --- a/libs/ardour/session_rtevents.cc +++ b/libs/ardour/session_rtevents.cc @@ -41,7 +41,7 @@ using namespace ARDOUR; using namespace Glib; void -Session::set_controls (std::shared_ptr cl, double val, Controllable::GroupControlDisposition gcd) +Session::set_controls (std::shared_ptr cl, double val, Controllable::GroupControlDisposition gcd) { if (cl->empty()) { return; @@ -71,8 +71,8 @@ Session::set_controls (std::shared_ptr cl, double val, Controllable } #endif - std::shared_ptr wcl (new WeakControlList); - for (ControlList::iterator ci = cl->begin(); ci != cl->end(); ++ci) { + std::shared_ptr wcl (new WeakAutomationControlList); + for (AutomationControlList::iterator ci = cl->begin(); ci != cl->end(); ++ci) { /* as of july 2017 this is a no-op for everything except record enable */ (*ci)->pre_realtime_queue_stuff (val, gcd); /* fill in weak pointer ctrl list */ @@ -89,13 +89,13 @@ Session::set_control (std::shared_ptr ac, double val, Control return; } - std::shared_ptr cl (new ControlList); + std::shared_ptr cl (new AutomationControlList); cl->push_back (ac); set_controls (cl, val, gcd); } void -Session::rt_set_controls (std::shared_ptr cl, double val, Controllable::GroupControlDisposition gcd) +Session::rt_set_controls (std::shared_ptr cl, double val, Controllable::GroupControlDisposition gcd) { /* Note that we require that all controls in the ControlList are of the same type. diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 01097ce689..2a2c6408a5 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -1083,8 +1083,8 @@ Session::solo_selection_active () void Session::solo_selection (StripableList &list, bool new_state) { - std::shared_ptr solo_list (new ControlList); - std::shared_ptr unsolo_list (new ControlList); + std::shared_ptr solo_list (new AutomationControlList); + std::shared_ptr unsolo_list (new AutomationControlList); std::shared_ptr rl = get_routes(); diff --git a/libs/ardour/slavable.cc b/libs/ardour/slavable.cc index ec4439d6c7..c2e16b2f70 100644 --- a/libs/ardour/slavable.cc +++ b/libs/ardour/slavable.cc @@ -134,8 +134,8 @@ Slavable::do_assign (VCAManager* manager) assign (*v); } - SlavableControlList scl = slavables (); - for (SlavableControlList::iterator i = scl.begin(); i != scl.end(); ++i) { + SlavableAutomationControlList scl = slavables (); + for (SlavableAutomationControlList::iterator i = scl.begin(); i != scl.end(); ++i) { (*i)->use_saved_master_ratios (); } } @@ -197,8 +197,8 @@ bool Slavable::assign_controls (std::shared_ptr vca) { bool rv = false; - SlavableControlList scl = slavables (); - for (SlavableControlList::iterator i = scl.begin(); i != scl.end(); ++i) { + SlavableAutomationControlList scl = slavables (); + for (SlavableAutomationControlList::iterator i = scl.begin(); i != scl.end(); ++i) { rv |= assign_control (vca, *i); } return rv; @@ -207,8 +207,8 @@ Slavable::assign_controls (std::shared_ptr vca) void Slavable::unassign_controls (std::shared_ptr vca) { - SlavableControlList scl = slavables (); - for (SlavableControlList::iterator i = scl.begin(); i != scl.end(); ++i) { + SlavableAutomationControlList scl = slavables (); + for (SlavableAutomationControlList::iterator i = scl.begin(); i != scl.end(); ++i) { unassign_control (vca, *i); } } diff --git a/libs/ardour/slavable_automation_control.cc b/libs/ardour/slavable_automation_control.cc index 1f1d0e43b3..c9b8714f6d 100644 --- a/libs/ardour/slavable_automation_control.cc +++ b/libs/ardour/slavable_automation_control.cc @@ -405,7 +405,7 @@ SlavableAutomationControl::clear_masters () const double old_val = AutomationControl::get_double (); - ControlList masters; + AutomationControlList masters; bool update_value = false; double master_ratio = 0; double list_ratio = toggled () ? 0 : 1; @@ -447,7 +447,7 @@ SlavableAutomationControl::clear_masters () if (_list) { XMLNode* before = &alist ()->get_state (); if (!masters.empty()) { - for (ControlList::const_iterator m = masters.begin(); m != masters.end(); ++m) { + for (AutomationControlList::const_iterator m = masters.begin(); m != masters.end(); ++m) { _list->list_merge (*(*m)->list().get(), boost::bind (&SlavableAutomationControl::scale_automation_callback, this, _1, _2)); } _list->y_transform (boost::bind (&SlavableAutomationControl::scale_automation_callback, this, _1, list_ratio)); diff --git a/libs/ardour/vca.cc b/libs/ardour/vca.cc index 57eeb20d0a..be2cefdf16 100644 --- a/libs/ardour/vca.cc +++ b/libs/ardour/vca.cc @@ -220,10 +220,10 @@ VCA::assign (std::shared_ptr v) Slavable::assign (v); } -SlavableControlList +SlavableAutomationControlList VCA::slavables () const { - SlavableControlList rv; + SlavableAutomationControlList rv; rv.push_back (_gain_control); rv.push_back (_mute_control); rv.push_back (_solo_control); diff --git a/libs/surfaces/faderport8/actions.cc b/libs/surfaces/faderport8/actions.cc index 42518aa89f..d448dd1d8f 100644 --- a/libs/surfaces/faderport8/actions.cc +++ b/libs/surfaces/faderport8/actions.cc @@ -339,7 +339,7 @@ FaderPort8::button_solo_clear () cancel_all_solo (); // AccessAction ("Main", "cancel-solo"); } else { /* restore solo */ - std::shared_ptr cl (new ControlList); + std::shared_ptr cl (new AutomationControlList); for (std::vector >::const_iterator i = _solo_state.begin(); i != _solo_state.end(); ++i) { std::shared_ptr ac = (*i).lock(); if (!ac) { @@ -363,7 +363,7 @@ FaderPort8::button_mute_clear () _mute_state = session->cancel_all_mute (); } else { /* restore mute */ - std::shared_ptr cl (new ControlList); + std::shared_ptr cl (new AutomationControlList); for (std::vector >::const_iterator i = _mute_state.begin(); i != _mute_state.end(); ++i) { std::shared_ptr ac = (*i).lock(); if (!ac) {