add a new constructor for RouteAutomationControllable that takes a ParameterDescriptor

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 44069462d1e7d4dcf9fdd2a40371bbda94bae6aa..a75ef5f6a63ec603fcff229b15ae180e7fc75295 100644 (file)
--- 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 7e35430b7a90fd7ac7f5058df37df9c389865f18..da0183304ce4681a89b3fe275ac61f4afb9756b8 100644 (file)
--- 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 71e44ef91c13431ae3444282715cb6c471bb7ac0..38571b9b8b63b5f2ce02a3e024460c8e2f13297c 100644 (file)
--- 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)