Merged with trunk R846

Removed some overly verbose debug printing


git-svn-id: svn://localhost/ardour2/branches/midi@847 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 84 insertions, 9 deletions

diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index af507208ab..4e7c4151b7 100644
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -2,24 +2,99 @@
 #include <ardour/route.h>
 #include <pbd/memento_command.h>
 #include <ardour/diskstream.h>
+#include <ardour/playlist.h>
+#include <ardour/tempo.h>
+#include <ardour/audiosource.h>
+#include <ardour/audioregion.h>
+#include <pbd/error.h>
+using namespace PBD;
+#include "i18n.h"
+
 
 namespace ARDOUR {
 
+static map<PBD::ID, Stateful*> registry;
+
+void Session::register_with_memento_command_factory(PBD::ID id, Stateful *ptr)
+{
+    registry[id] = ptr;
+}
+    
 Command *Session::memento_command_factory(XMLNode *n)
 {
     PBD::ID id;
-    XMLNode *before, *after;
+    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());
+	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;
+    }
+
+    if (!child)
+    {
+	error << _("Tried to reconstitute a MementoCommand with no contents, failing. id=") << id.to_s() << endmsg;
+	return 0;
+    }
 
-    /* get obj_id */
 
-    /* get before and/or after */
+    /* create command */
+    string obj_T = n->children().front()->name();
+    if (obj_T == "AudioRegion" || obj_T == "MidiRegion" || obj_T == "Region")
+    {
+        if (regions.count(id))
+            return new MementoCommand<Region>(*regions[id], before, after);
+    }
+    else if (obj_T == "Source" || obj_T == "AudioSource" || obj_T == "MidiSource")
+    {
+        if (sources.count(id))
+            return new MementoCommand<Source>(*sources[id], before, after);
+    }
+    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 == "MidiPlaylist" || obj_T == "AudioPlaylist")
+    {
+        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);
+    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);
+    }
+    // For Editor and AutomationLine which are off-limits here
+    else if (registry.count(id))
+        return new MementoCommand<Stateful>(*registry[id], before, after);
 
-    /* get an object by id by trial and error, and use it to construct an
-     * appropriate memento command */
-    // e.g.
-    if (Diskstream *obj = diskstream_by_id(id))
-	return new MementoCommand<Diskstream>(*obj, *before, *after);
-    // etc.
+    /* we failed */
+    error << _("could not reconstitute MementoCommand from XMLNode. id=") << id.to_s() << endmsg;
+    return 0;
 	
 	return 0;
 }