Fix some workflow problems wrt automation.

[ardour.git] / libs / evoral / src / Control.cpp

diff --git a/libs/evoral/src/Control.cpp b/libs/evoral/src/Control.cpp
index 480d027ccc85812ae6a750d9bc861e6c2a2f5322..68858cd145ab02f08d9f6c679f3583140665a5c2 100644 (file)
--- a/libs/evoral/src/Control.cpp
+++ b/libs/evoral/src/Control.cpp
@@ -22,14 +22,16 @@
 
 #include "evoral/Control.hpp"
 #include "evoral/ControlList.hpp"
+#include "evoral/ParameterDescriptor.hpp"
+#include "evoral/TypeMap.hpp"
 
 namespace Evoral {
 
-Parameter::TypeMetadata Parameter::_type_metadata;
-
-Control::Control(const Parameter& parameter, boost::shared_ptr<ControlList> list)
+Control::Control(const Parameter&               parameter,
+                 const ParameterDescriptor&     desc,
+                 boost::shared_ptr<ControlList> list)
        : _parameter(parameter)
-       , _user_value(list ? list->default_value() : parameter.normal())
+       , _user_value(list ? list->default_value() : desc.normal)
 {
        set_list (list);
 }
@@ -57,7 +59,7 @@ Control::set_double (double value, double frame, bool to_list)
           values and add them to the list, so we we don't need to bother.
        */
 
-       if (to_list && !_list->in_write_pass()) {
+       if (to_list && (!_list->in_write_pass() || _list->descriptor().toggled)) {
                _list->add (frame, value, false);
        }
 }