unused but slightly tricky code to add track name/instrument to an SMF file when...

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

diff --git a/libs/evoral/src/Control.cpp b/libs/evoral/src/Control.cpp
index bb272ea8b32a782042cc7bf853e2810586051db3..56f5f70f2ce467572f0e36943a59648e703d35b4 100644 (file)
--- a/libs/evoral/src/Control.cpp
+++ b/libs/evoral/src/Control.cpp
@@ -17,16 +17,19 @@
  */
 
 #include <iostream>
+
 #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);
 }
@@ -50,8 +53,12 @@ Control::set_double (double value, double frame, bool to_list)
 {
        _user_value = value;
 
-       if (to_list) {
-               _list->add (frame, value);
+       /* if we're in a write pass, the automation watcher will determine the
+          values and add them to the list, so we we don't need to bother.
+       */
+
+       if (to_list && (!_list->in_write_pass() || _list->descriptor().toggled)) {
+               _list->add (frame, value, false);
        }
 }
 
@@ -60,7 +67,7 @@ void
 Control::set_list(boost::shared_ptr<ControlList> list)
 {
        _list_marked_dirty_connection.disconnect ();
-       
+
        _list = list;
 
        if (_list) {