Remove some aborts that don't really need to be.

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

diff --git a/libs/evoral/src/Control.cpp b/libs/evoral/src/Control.cpp
index 079bd2929efa449be9a1ae8475a5e10049013775..68858cd145ab02f08d9f6c679f3583140665a5c2 100644 (file)
--- a/libs/evoral/src/Control.cpp
+++ b/libs/evoral/src/Control.cpp
@@ -1,63 +1,86 @@
 /* This file is part of Evoral.
- * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
+ * Copyright (C) 2008 David Robillard <http://drobilla.net>
  * Copyright (C) 2000-2008 Paul Davis
- * 
+ *
  * Evoral is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version.
- * 
+ *
  * Evoral is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <iostream>
+
+#include "pbd/stacktrace.h"
+
 #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)
-       , _list(list)
-       , _user_value(list ? list->default_value() : parameter.normal())
+       , _user_value(list ? list->default_value() : desc.normal)
 {
+       set_list (list);
 }
 
 
 /** Get the currently effective value (ie the one that corresponds to current output)
  */
-float
-Control::get_float(bool from_list, FrameTime frame) const
+double
+Control::get_double (bool from_list, double frame) const
 {
-       if (from_list)
+       if (from_list) {
                return _list->eval(frame);
-       else
+       } else {
                return _user_value;
+       }
 }
 
 
 void
-Control::set_float(float value, bool to_list, FrameTime frame)
+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);
+       }
 }
 
 
 void
 Control::set_list(boost::shared_ptr<ControlList> list)
 {
+       _list_marked_dirty_connection.disconnect ();
+       
        _list = list;
+
+       if (_list) {
+               _list->Dirty.connect_same_thread (_list_marked_dirty_connection, boost::bind (&Control::list_marked_dirty, this));
+       }
+}
+
+void
+Control::list_marked_dirty ()
+{
+       ListMarkedDirty (); /* EMIT SIGNAL */
 }
 
 } // namespace Evoral