fix crash when copy'ing latent plugins

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

diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index bc8ca8e6425863beb45d6cf6289a7d6047e1f736..4b23378cacd1275e0d170fb660682ac177bca556 100644 (file)
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -27,10 +27,11 @@
 #include "ardour/event_type_map.h"
 #include "ardour/parameter_descriptor.h"
 #include "evoral/Curve.hpp"
+#include "pbd/memento_command.h"
 #include "pbd/stacktrace.h"
 #include "pbd/enumwriter.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -130,6 +131,7 @@ AutomationList::AutomationList (const XMLNode& node, Evoral::Parameter id)
 
 AutomationList::~AutomationList()
 {
+       delete _before;
 }
 
 boost::shared_ptr<Evoral::ControlList>
@@ -191,8 +193,11 @@ AutomationList::set_automation_state (AutoState s)
 {
        if (s != _state) {
                _state = s;
+               delete _before;
                if (s == Write && _desc.toggled) {
                        _before = &get_state ();
+               } else {
+                       _before = 0;
                }
                automation_state_changed (s); /* EMIT SIGNAL */
        }
@@ -210,8 +215,11 @@ AutomationList::set_automation_style (AutoStyle s)
 void
 AutomationList::start_write_pass (double when)
 {
+       delete _before;
        if (in_new_write_pass ()) {
                _before = &get_state ();
+       } else {
+               _before = 0;
        }
        ControlList::start_write_pass (when);
 }
@@ -220,8 +228,6 @@ void
 AutomationList::write_pass_finished (double when, double thinning_factor)
 {
        ControlList::write_pass_finished (when, thinning_factor);
-       /* automation control has deleted this or it is now owned by the session undo stack */
-       _before = 0;
 }
 
 void
@@ -259,7 +265,9 @@ AutomationList::stop_touch (bool mark, double)
 
 /* _before may be owned by the undo stack,
  * so we have to be careful about doing this.
-*/
+ *
+ * ::before () transfers ownership, setting _before to 0
+ */
 void
 AutomationList::clear_history ()
 {
@@ -278,6 +286,12 @@ AutomationList::thaw ()
        }
 }
 
+Command*
+AutomationList::memento_command (XMLNode* before, XMLNode* after)
+{
+       return new MementoCommand<AutomationList> (*this, before, after);
+}
+
 XMLNode&
 AutomationList::get_state ()
 {
@@ -289,7 +303,7 @@ AutomationList::state (bool full)
 {
        XMLNode* root = new XMLNode (X_("AutomationList"));
        char buf[64];
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
 
        root->add_property ("automation-id", EventTypeMap::instance().to_symbol(_parameter));
 
@@ -407,11 +421,11 @@ AutomationList::deserialize_events (const XMLNode& node)
 int
 AutomationList::set_state (const XMLNode& node, int version)
 {
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
        XMLNodeList nlist = node.children();
        XMLNode* nsos;
        XMLNodeIterator niter;
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if (node.name() == X_("events")) {
                /* partial state setting*/
@@ -429,7 +443,7 @@ AutomationList::set_state (const XMLNode& node, int version)
 
                const XMLNodeList& elist = node.children();
                XMLNodeConstIterator i;
-               XMLProperty* prop;
+               XMLProperty const * prop;
                pframes_t x;
                double y;