display results of a bounce in the region list

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

diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index 4021fae5731171a7e31d709ebeb27410a4a61a67..b54e5c83980c5efb124b3acbcda5dc26503870c2 100644 (file)
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -13,9 +13,7 @@ using namespace PBD;
 
 namespace ARDOUR {
 
-static map<PBD::ID, Stateful*> registry;
-
-void Session::register_with_memento_command_factory(PBD::ID id, Stateful *ptr)
+void Session::register_with_memento_command_factory(PBD::ID id, StatefulDestructible *ptr)
 {
     registry[id] = ptr;
 }
@@ -24,6 +22,7 @@ Command *Session::memento_command_factory(XMLNode *n)
 {
     PBD::ID id;
     XMLNode *before = 0, *after = 0;
+    XMLNode *child;
 
     /* get id */
     id = PBD::ID(n->property("obj_id")->value());
@@ -31,12 +30,25 @@ Command *Session::memento_command_factory(XMLNode *n)
     /* get before/after */
     if (n->name() == "MementoCommand")
     {
-        before = n->children().front();
-        after = n->children().back();
+        before = new XMLNode(*n->children().front());
+        after = new XMLNode(*n->children().back());
+       child = before;
     } else if (n->name() == "MementoUndoCommand")
-        before = n->children().front();
+    {
+        before = new XMLNode(*n->children().front());
+       child = before;
+    }
     else if (n->name() == "MementoRedoCommand")
-        after = n->children().front();
+    {
+        after = new XMLNode(*n->children().front());
+       child = after;
+    }
+
+    if (!child)
+    {
+       error << _("Tried to reconstitute a MementoCommand with no contents, failing. id=") << id.to_s() << endmsg;
+       return 0;
+    }
 
 
     /* create command */
@@ -59,14 +71,11 @@ Command *Session::memento_command_factory(XMLNode *n)
         return new MementoCommand<TempoMap>(*_tempo_map, before, after);
     else if (obj_T == "Playlist" || obj_T == "AudioPlaylist")
     {
-        if (Playlist *pl = playlist_by_name(before->property("name")->value()))
+        if (Playlist *pl = playlist_by_name(child->property("name")->value()))
             return new MementoCommand<Playlist>(*pl, before, after);
     }
     else if (obj_T == "Route") // inlcudes AudioTrack
         return new MementoCommand<Route>(*route_by_id(id), before, after);
-    // For Editor and AutomationLine which are off-limits here
-    else if (registry.count(id))
-        return new MementoCommand<Stateful>(*registry[id], before, after);
     else if (obj_T == "Curve")
     {
         if (curves.count(id))
@@ -77,6 +86,10 @@ Command *Session::memento_command_factory(XMLNode *n)
         if (automation_lists.count(id))
             return new MementoCommand<AutomationList>(*automation_lists[id], before, after);
     }
+    // For Editor and AutomationLine which are off-limits here
+    else if (registry.count(id))
+        return new MementoCommand<StatefulDestructible>(*registry[id], before, after);
+
 
     /* we failed */
     error << _("could not reconstitute MementoCommand from XMLNode. id=") << id.to_s() << endmsg;