X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_command.cc;h=3d2da887b05f7139720274fd76e9ca7b2f91fad1;hb=337cee7a8344c76edc9068bf733ee8489b1c9bef;hp=8c1a4b32cfeefc03f92ac064253332f99247c8b7;hpb=81b9700c145abfb6f2e32d5a9bd13895e42b04e2;p=ardour.git

diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index 8c1a4b32cf..3d2da887b0 100644
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -3,19 +3,21 @@
 #include <pbd/memento_command.h>
 #include <ardour/diskstream.h>
 #include <ardour/playlist.h>
+#include <ardour/audioplaylist.h>
+#include <ardour/audio_track.h>
 #include <ardour/tempo.h>
 #include <ardour/audiosource.h>
 #include <ardour/audioregion.h>
 #include <pbd/error.h>
+#include <pbd/statefuldestructible.h>
+
 using namespace PBD;
-#include "i18n.h"
 
+#include "i18n.h"
 
 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, PBD::StatefulThingWithGoingAway *ptr)
 {
     registry[id] = ptr;
 }
@@ -24,63 +26,64 @@ 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());
 
     /* get before/after */
-    if (n->name() == "MementoCommand")
-    {
-        before = new XMLNode(*n->children().front());
-        after = new XMLNode(*n->children().back());
-    } else if (n->name() == "MementoUndoCommand")
-        before = new XMLNode(*n->children().front());
-    else if (n->name() == "MementoRedoCommand")
-        after = new XMLNode(*n->children().front());
-
 
-    /* create command */
-    string obj_T = n->children().front()->name();
-    if (obj_T == "AudioRegion" || obj_T == "Region")
-    {
-        if (audio_regions.count(id))
-            return new MementoCommand<AudioRegion>(*audio_regions[id], before, after);
+    if (n->name() == "MementoCommand") {
+	    before = new XMLNode(*n->children().front());
+	    after = new XMLNode(*n->children().back());
+	    child = before;
+    } else if (n->name() == "MementoUndoCommand") {
+	    before = new XMLNode(*n->children().front());
+	    child = before;
+    } else if (n->name() == "MementoRedoCommand") {
+	    after = new XMLNode(*n->children().front());
+	    child = after;
+    } else if (n->name() == "PlaylistCommand") {
+	    before = new XMLNode(*n->children().front());
+	    after = new XMLNode(*n->children().back());
+	    child = before;
     }
-    else if (obj_T == "AudioSource")
+		    
+    if (!child)
     {
-        if (audio_sources.count(id))
-            return new MementoCommand<AudioSource>(*audio_sources[id], before, after);
+	error << _("Tried to reconstitute a MementoCommand with no contents, failing. id=") << id.to_s() << endmsg;
+	return 0;
     }
-    else if (obj_T == "Location")
-        return new MementoCommand<Location>(*_locations.get_location_by_id(id), before, after);
-    else if (obj_T == "Locations")
-        return new MementoCommand<Locations>(_locations, before, after);
-    else if (obj_T == "TempoMap")
-        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()))
-            return new MementoCommand<Playlist>(*pl, before, after);
-    }
-    else if (obj_T == "Route") // inlcudes AudioTrack
-        return new MementoCommand<Route>(*route_by_id(id), before, after);
-    else if (obj_T == "Curve")
-    {
-        if (curves.count(id))
-            return new MementoCommand<Curve>(*curves[id], before, after);
-    }
-    else if (obj_T == "AutomationList")
-    {
-        if (automation_lists.count(id))
-            return new MementoCommand<AutomationList>(*automation_lists[id], before, after);
+
+    /* create command */
+    string obj_T = n->property ("type_name")->value();
+    if (obj_T == typeid (AudioRegion).name() || obj_T == typeid (Region).name()) {
+	    if (audio_regions.count(id))
+		    return new MementoCommand<AudioRegion>(*audio_regions[id], before, after);
+    } else if (obj_T == typeid (AudioSource).name()) {
+	    if (audio_sources.count(id))
+		    return new MementoCommand<AudioSource>(*audio_sources[id], before, after);
+    } else if (obj_T == typeid (Location).name()) {
+	    return new MementoCommand<Location>(*_locations.get_location_by_id(id), before, after);
+    } else if (obj_T == typeid (Locations).name()) {
+	    return new MementoCommand<Locations>(_locations, before, after);
+    } else if (obj_T == typeid (TempoMap).name()) {
+	    return new MementoCommand<TempoMap>(*_tempo_map, before, after);
+    } else if (obj_T == typeid (Playlist).name() || obj_T == typeid (AudioPlaylist).name()) {
+	    if (Playlist *pl = playlist_by_name(child->property("name")->value()))
+		    return new MementoCommand<Playlist>(*pl, before, after);
+    } else if (obj_T == typeid (Route).name() || obj_T == typeid (AudioTrack).name()) { 
+	    return new MementoCommand<Route>(*route_by_id(id), before, after);
+    } else if (obj_T == typeid (Curve).name() || obj_T == typeid (AutomationList).name()) {
+	    if (automation_lists.count(id))
+		    return new MementoCommand<AutomationList>(*automation_lists[id], before, after);
+    } else if (registry.count(id)) { // For Editor and AutomationLine which are off-limits here
+	    return new MementoCommand<PBD::StatefulThingWithGoingAway>(*registry[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);
 
     /* we failed */
-    error << _("could not reconstitute MementoCommand from XMLNode. id=") << id.to_s() << endmsg;
-    return 0;
+    error << string_compose (_("could not reconstitute MementoCommand from XMLNode. object type = %1 id = %2"), obj_T, id.to_s()) << endmsg;
+    return 0 ;
 }
 
 // solo