remove Glib::ustring from libardour; allow any characters except '/' and '\' in paths...

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

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index afa14c3f98ec937237dfef08832f4d5684bad343..2989d82818ecc23bb8dde1eda6dc1bdc0a7e11ff 100644 (file)
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2007 Paul Davis 
+    Copyright (C) 2007 Paul Davis
     Author: Dave Robillard
 
     This program is free software; you can redistribute it and/or modify
@@ -19,10 +19,10 @@
 */
 
 #include <iostream>
-#include <ardour/automation_control.h>
-#include <ardour/session.h>
-#include <ardour/automatable.h>
-#include <ardour/midi_track.h>
+#include "ardour/automatable.h"
+#include "ardour/automation_control.h"
+#include "ardour/event_type_map.h"
+#include "ardour/session.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -31,33 +31,37 @@ using namespace PBD;
 
 AutomationControl::AutomationControl(
                ARDOUR::Session& session,
-               const Parameter& parameter,
+               const Evoral::Parameter& parameter,
                boost::shared_ptr<ARDOUR::AutomationList> list,
                const string& name)
-       : Controllable((name != "") ? name : parameter.symbol())
+       : Controllable((name != "") ? name : EventTypeMap::instance().to_symbol(parameter))
        , Evoral::Control(parameter, list)
        , _session(session)
 {
 }
 
-
-/** Get the currently effective value (ie the one that corresponds to current output)
- */
-float
+double
 AutomationControl::get_value() const
 {
        bool from_list = _list && ((AutomationList*)_list.get())->automation_playback();
-       return Control::get_value(from_list, _session.transport_frame());
+       return Control::get_double (from_list, _session.transport_frame());
 }
 
-
 void
-AutomationControl::set_value(float value)
+AutomationControl::set_value(double value)
 {
        bool to_list = _list && _session.transport_stopped()
-               && ((AutomationList*)_list.get())->automation_playback();
-       
-       Control::set_value(value, to_list, _session.transport_frame());
+               && ((AutomationList*)_list.get())->automation_write();
+ 
+        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);
+        }
+
+       Control::set_double (value, to_list, _session.transport_frame());
 
        Changed(); /* EMIT SIGNAL */
 }