diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-31 21:45:36 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-31 21:45:36 -0500 |
commit | 9128fbd68f7bc03ea0b3238fc9dd24ff326f1ad8 (patch) | |
tree | 46648be9e5abcb002da2726a5dfdec0fb49dbfba | |
parent | e2a085190f02cfba8ddbf06a31e37e38c40fafc4 (diff) |
add a new constructor for RouteAutomationControllable that takes a ParameterDescriptor
-rw-r--r-- | libs/ardour/ardour/route.h | 11 | ||||
-rw-r--r-- | libs/ardour/route.cc | 1 | ||||
-rw-r--r-- | libs/ardour/route_controls.cc | 11 |
3 files changed, 17 insertions, 6 deletions
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 44069462d1..a75ef5f6a6 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -392,12 +392,11 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou boost::shared_ptr<AutomationList> alist, boost::shared_ptr<Route> route); - void set_value (double val, PBD::Controllable::GroupControlDisposition group_override) { - boost::shared_ptr<Route> r = _route.lock(); - if (r) { - r->set_control ((AutomationType) parameter().type(), val, group_override); - } - } + RouteAutomationControl (const std::string& name, + AutomationType atype, + const ParameterDescriptor& descriptor, + boost::shared_ptr<AutomationList> alist, + boost::shared_ptr<Route> route); protected: friend class Route; diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 7e35430b7a..da0183304c 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -57,6 +57,7 @@ #include "ardour/pannable.h" #include "ardour/panner.h" #include "ardour/panner_shell.h" +#include "ardour/parameter_descriptor.h" #include "ardour/plugin_insert.h" #include "ardour/port.h" #include "ardour/port_insert.h" diff --git a/libs/ardour/route_controls.cc b/libs/ardour/route_controls.cc index 71e44ef91c..38571b9b8b 100644 --- a/libs/ardour/route_controls.cc +++ b/libs/ardour/route_controls.cc @@ -22,6 +22,7 @@ #endif #include "ardour/automation_control.h" +#include "ardour/parameter_descriptor.h" #include "ardour/route.h" #include "ardour/session.h" @@ -98,6 +99,16 @@ Route::RouteAutomationControl::RouteAutomationControl (const std::string& name, { } +Route::RouteAutomationControl::RouteAutomationControl (const std::string& name, + AutomationType atype, + const ParameterDescriptor& desc, + boost::shared_ptr<AutomationList> alist, + boost::shared_ptr<Route> r) + : AutomationControl (r->session(), Evoral::Parameter (atype), desc, alist, name) + , _route (r) +{ +} + Route::GainControllable::GainControllable (Session& s, AutomationType atype, boost::shared_ptr<Route> r) : GainControl (s, Evoral::Parameter(atype)) , _route (r) |