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 985c7b13520aaf1ba4c0a809e7bb6688a203f54a..68858cd145ab02f08d9f6c679f3583140665a5c2 100644 (file)
--- a/libs/evoral/src/Control.cpp
+++ b/libs/evoral/src/Control.cpp
@@ -1,5 +1,5 @@
 /* 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
@@ -17,16 +17,21 @@
  */
 
 #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)
-       , _user_value(list ? list->default_value() : parameter.normal())
+       , _user_value(list ? list->default_value() : desc.normal)
 {
        set_list (list);
 }
@@ -34,8 +39,8 @@ Control::Control(const Parameter& parameter, boost::shared_ptr<ControlList> 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) {
                return _list->eval(frame);
@@ -46,12 +51,16 @@ Control::get_float(bool from_list, FrameTime frame) const
 
 
 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 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->add(frame, value);
+       if (to_list && (!_list->in_write_pass() || _list->descriptor().toggled)) {
+               _list->add (frame, value, false);
        }
 }