Fix some workflow problems wrt automation.

[ardour.git] / libs / ardour / automation_control.cc

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index 237d51a9d306d03b8ca6f26d02e5cbf6a4cbfd27..da33ad12a52ed1b21e8d8f187cd6a4cb33d47667 100644 (file)
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -29,14 +29,15 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-AutomationControl::AutomationControl(
-               ARDOUR::Session& session,
-               const Evoral::Parameter& parameter,
-               boost::shared_ptr<ARDOUR::AutomationList> list,
-               const string& name)
+AutomationControl::AutomationControl(ARDOUR::Session&                          session,
+                                     const Evoral::Parameter&                  parameter,
+                                     const ParameterDescriptor&                desc,
+                                     boost::shared_ptr<ARDOUR::AutomationList> list,
+                                     const string&                             name)
        : Controllable (name.empty() ? EventTypeMap::instance().to_symbol(parameter) : name)
-       , Evoral::Control(parameter, list)
+       , Evoral::Control(parameter, desc, list)
        , _session(session)
+       , _desc(desc)
 {
 }
 
@@ -60,23 +61,12 @@ void
 AutomationControl::set_value (double value)
 {
        bool to_list = _list && ((AutomationList*)_list.get())->automation_write();
-       bool erase_since_last = _session.transport_rolling();
 
-        if (to_list && parameter().toggled()) {
-
-                // store the previous value just before this so any
-                // interpolation works right
-
-
-                _list->add (get_double(), _session.transport_frame()-1, erase_since_last);
-        }
-
-       Control::set_double (value, _session.transport_frame(), to_list, erase_since_last);
+       Control::set_double (value, _session.transport_frame(), to_list);
 
        Changed(); /* EMIT SIGNAL */
 }
 
-
 void
 AutomationControl::set_list (boost::shared_ptr<Evoral::ControlList> list)
 {
@@ -87,42 +77,113 @@ AutomationControl::set_list (boost::shared_ptr<Evoral::ControlList> list)
 void
 AutomationControl::set_automation_state (AutoState as)
 {
-       if (as != alist()->automation_state()) {
+       if (_list && as != alist()->automation_state()) {
 
-               cerr << name() << " setting automation state to " << enum_2_string (as) << endl;
+               alist()->set_automation_state (as);
+               if (_desc.toggled) {
+                       return;  // No watch for boolean automation
+               }
 
                if (as == Write) {
                        AutomationWatch::instance().add_automation_watch (shared_from_this());
                } else if (as == Touch) {
                        if (!touching()) {
                                AutomationWatch::instance().remove_automation_watch (shared_from_this());
+                       } else {
+                               /* this seems unlikely, but the combination of
+                                * a control surface and the mouse could make
+                                * it possible to put the control into Touch
+                                * mode *while* touching it.
+                                */
+                               AutomationWatch::instance().add_automation_watch (shared_from_this());
                        }
                } else {
                        AutomationWatch::instance().remove_automation_watch (shared_from_this());
                }
-               
-               alist()->set_automation_state (as);
        }
 }
 
 void
 AutomationControl::set_automation_style (AutoStyle as)
 {
+       if (!_list) return;
        alist()->set_automation_style (as);
 }
 
 void
 AutomationControl::start_touch(double when)
 {
-       set_touching (true);
-       AutomationWatch::instance().add_automation_watch (shared_from_this());
-       alist()->start_touch(when);
+       if (!_list) return;
+       if (!touching()) {
+               if (alist()->automation_state() == Touch) {
+                       /* subtle. aligns the user value with the playback */
+                       set_value (get_value ());
+                       alist()->start_touch (when);
+                       if (!_desc.toggled) {
+                               AutomationWatch::instance().add_automation_watch (shared_from_this());
+                       }
+               }
+               set_touching (true);
+       }
 }
 
 void
 AutomationControl::stop_touch(bool mark, double when)
 {
-       set_touching (false);
-       AutomationWatch::instance().remove_automation_watch (shared_from_this());
-       alist()->stop_touch (mark, when);
+       if (!_list) return;
+       if (touching()) {
+               set_touching (false);
+               if (alist()->automation_state() == Touch) {
+                       alist()->stop_touch (mark, when);
+                       if (!_desc.toggled) {
+                               AutomationWatch::instance().remove_automation_watch (shared_from_this());
+                       }
+               }
+       }
+}
+
+double
+AutomationControl::internal_to_interface (double val) const
+{
+       if (_desc.integer_step) {
+               // both upper and lower are inclusive.
+               val =  (val - lower()) / (1 + upper() - lower());
+       } else {
+               val =  (val - lower()) / (upper() - lower());
+       }
+
+       if (_desc.logarithmic) {
+               if (val > 0) {
+                       val = pow (val, 1/1.5);
+               } else {
+                       val = 0;
+               }
+       }
+
+       return val;
 }
+
+double
+AutomationControl::interface_to_internal (double val) const
+{
+       if (_desc.logarithmic) {
+               if (val <= 0) {
+                       val = 0;
+               } else {
+                       val = pow (val, 1.5);
+               }
+       }
+
+       if (_desc.integer_step) {
+               val =  lower() + val * (1 + upper() - lower());
+       } else {
+               val =  lower() + val * (upper() - lower());
+       }
+
+       if (val < lower()) val = lower();
+       if (val > upper()) val = upper();
+
+       return val;
+}
+
+