Consistent Automation evaluation:

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

diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index e108676fa7b5f6096b0a7667952b20d0031f5c50..908ca181372f601c1d6ef851c8c9395d241e09d4 100644 (file)
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -37,10 +37,12 @@
 #include "ardour/plugin_insert.h"
 #include "ardour/record_enable_control.h"
 #include "ardour/session.h"
+#ifdef LV2_SUPPORT
 #include "ardour/uri_map.h"
+#endif
 #include "ardour/value_as_string.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -67,12 +69,9 @@ Automatable::Automatable (const Automatable& other)
 
 Automatable::~Automatable ()
 {
-       {
-               Glib::Threads::Mutex::Lock lm (_control_lock);
-
-               for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) {
-                       boost::dynamic_pointer_cast<AutomationControl>(li->second)->drop_references ();
-               }
+       Glib::Threads::Mutex::Lock lm (_control_lock);
+       for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) {
+               boost::dynamic_pointer_cast<AutomationControl>(li->second)->drop_references ();
        }
 }
 
@@ -186,6 +185,8 @@ Automatable::describe_parameter (Evoral::Parameter param)
                return string_compose("Bender [%1]", int(param.channel()) + 1);
        } else if (param.type() == MidiChannelPressureAutomation) {
                return string_compose("Pressure [%1]", int(param.channel()) + 1);
+       } else if (param.type() == MidiNotePressureAutomation) {
+               return string_compose("PolyPressure [%1]", int(param.channel()) + 1);
 #ifdef LV2_SUPPORT
        } else if (param.type() == PluginPropertyAutomation) {
                return string_compose("Property %1", URIMap::instance().id_to_uri(param.id()));
@@ -233,7 +234,12 @@ Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter le
                        if (param.type() == NullAutomation) {
                                warning << "Automation has null type" << endl;
                                continue;
-                        }
+                       }
+
+                       if (_can_automate_list.find (param) == _can_automate_list.end ()) {
+                               warning << "Ignored automation data for non-automatable parameter" << endl;
+                               continue;
+                       }
 
                        if (!id_prop) {
                                warning << "AutomationList node without automation-id property, "
@@ -271,7 +277,7 @@ Automatable::get_automation_xml_state ()
 
        for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) {
                boost::shared_ptr<AutomationList> l = boost::dynamic_pointer_cast<AutomationList>(li->second->list());
-               if (l && !l->empty()) {
+               if (l) {
                        node->add_child_nocopy (l->get_state ());
                }
        }
@@ -307,34 +313,6 @@ Automatable::get_parameter_automation_state (Evoral::Parameter param)
        return result;
 }
 
-void
-Automatable::set_parameter_automation_style (Evoral::Parameter param, AutoStyle s)
-{
-       Glib::Threads::Mutex::Lock lm (control_lock());
-
-       boost::shared_ptr<AutomationControl> c = automation_control(param, true);
-
-       if (c && (s != c->automation_style())) {
-               c->set_automation_style (s);
-               _a_session.set_dirty ();
-       }
-}
-
-AutoStyle
-Automatable::get_parameter_automation_style (Evoral::Parameter param)
-{
-       Glib::Threads::Mutex::Lock lm (control_lock());
-
-       boost::shared_ptr<Evoral::Control> c = control(param);
-       boost::shared_ptr<AutomationList> l = boost::dynamic_pointer_cast<AutomationList>(c->list());
-
-       if (c) {
-               return l->automation_style();
-       } else {
-               return Absolute; // whatever
-       }
-}
-
 void
 Automatable::protect_automation ()
 {
@@ -367,7 +345,7 @@ Automatable::transport_located (framepos_t now)
                boost::shared_ptr<AutomationControl> c
                                = boost::dynamic_pointer_cast<AutomationControl>(li->second);
                if (c) {
-                        boost::shared_ptr<AutomationList> l
+                       boost::shared_ptr<AutomationList> l
                                = boost::dynamic_pointer_cast<AutomationList>(c->list());
 
                        if (l) {
@@ -417,6 +395,19 @@ Automatable::transport_stopped (framepos_t now)
        }
 }
 
+void
+Automatable::automation_run (framepos_t start, pframes_t nframes)
+{
+       for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) {
+               boost::shared_ptr<AutomationControl> c =
+                       boost::dynamic_pointer_cast<AutomationControl>(li->second);
+               if (!c) {
+                       continue;
+               }
+               c->automation_run (start, nframes);
+       }
+}
+
 boost::shared_ptr<Evoral::Control>
 Automatable::control_factory(const Evoral::Parameter& param)
 {
@@ -499,6 +490,21 @@ Automatable::control_factory(const Evoral::Parameter& param)
        return boost::shared_ptr<Evoral::Control>(control);
 }
 
+boost::shared_ptr<AutomationControl>
+Automatable::automation_control (PBD::ID const & id) const
+{
+       Controls::const_iterator li;
+
+       for (li = _controls.begin(); li != _controls.end(); ++li) {
+               boost::shared_ptr<AutomationControl> ac = boost::dynamic_pointer_cast<AutomationControl> (li->second);
+               if (ac && (ac->id() == id)) {
+                       return ac;
+               }
+       }
+
+       return boost::shared_ptr<AutomationControl>();
+}
+
 boost::shared_ptr<AutomationControl>
 Automatable::automation_control (const Evoral::Parameter& id, bool create)
 {
@@ -518,12 +524,6 @@ Automatable::clear_controls ()
        ControlSet::clear_controls ();
 }
 
-string
-Automatable::value_as_string (boost::shared_ptr<const AutomationControl> ac) const
-{
-       return ARDOUR::value_as_string(ac->desc(), ac->get_value());
-}
-
 bool
 Automatable::find_next_event (double now, double end, Evoral::ControlEvent& next_event, bool only_active) const
 {
@@ -539,6 +539,13 @@ Automatable::find_next_event (double now, double end, Evoral::ControlEvent& next
                        continue;
                }
 
+               boost::shared_ptr<SlavableAutomationControl> sc
+                       = boost::dynamic_pointer_cast<SlavableAutomationControl>(li->second);
+
+               if (sc) {
+                       sc->find_next_event (now, end, next_event);
+               }
+
                Evoral::ControlList::const_iterator i;
                boost::shared_ptr<const Evoral::ControlList> alist (li->second->list());
                Evoral::ControlEvent cp (now, 0.0f);