X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_command.cc;h=e5ddd0a0973ac9c816933584f7e852a74b76efcd;hb=65c8d673a2f88db61c68bf119f9dccbe82efd9ff;hp=6c2621fdb98b742bc847b01aa0a4338618489ed3;hpb=a1e0dc13df3cdc7033c940f0f3311a2bd47d3b2e;p=ardour.git

diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index 6c2621fdb9..e5ddd0a097 100644
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -33,6 +33,9 @@
 #include "ardour/midi_region.h"
 #include "ardour/session_playlists.h"
 #include "ardour/region_factory.h"
+#include "ardour/midi_automation_list_binder.h"
+#include "ardour/crossfade_binder.h"
+#include "ardour/crossfade.h"
 #include "pbd/error.h"
 #include "pbd/id.h"
 #include "pbd/statefuldestructible.h"
@@ -58,7 +61,12 @@ Session::memento_command_factory(XMLNode *n)
     XMLNode *child = 0;
 
     /* get id */
-    id = PBD::ID(n->property("obj-id")->value());
+
+    /* XXX: HACK! */
+    bool have_id = n->property("obj-id") != 0;
+    if (have_id) {
+	    id = PBD::ID(n->property("obj-id")->value());
+    }
 
     /* get before/after */
 
@@ -86,45 +94,68 @@ Session::memento_command_factory(XMLNode *n)
     /* create command */
     string obj_T = n->property ("type-name")->value();
 
-    if (obj_T == typeid (AudioRegion).name() || obj_T == typeid (MidiRegion).name() || obj_T == typeid (Region).name()) {
+    if (obj_T == "ARDOUR::AudioRegion" || obj_T == "ARDOUR::MidiRegion" || obj_T == "ARDOUR::Region") {
 	    boost::shared_ptr<Region> r = RegionFactory::region_by_id (id);
 	    if (r) {
 		    return new MementoCommand<Region>(*r, before, after);
 	    }
 
-    } else if (obj_T == typeid (AudioSource).name() || obj_T == typeid (MidiSource).name()) {
+    } else if (obj_T == "ARDOUR::AudioSource" || obj_T == "ARDOUR::MidiSource") {
 	    if (sources.count(id))
 		    return new MementoCommand<Source>(*sources[id], before, after);
 
-    } else if (obj_T == typeid (Location).name()) {
-	    Location* loc = _locations.get_location_by_id(id);
+    } else if (obj_T == "ARDOUR::Location") {
+	    Location* loc = _locations->get_location_by_id(id);
 	    if (loc) {
 		    return new MementoCommand<Location>(*loc, before, after);
 	    }
 
-    } else if (obj_T == typeid (Locations).name()) {
-	    return new MementoCommand<Locations>(_locations, before, after);
+    } else if (obj_T == "ARDOUR::Locations") {
+	    return new MementoCommand<Locations>(*_locations, before, after);
 
-    } else if (obj_T == typeid (TempoMap).name()) {
+    } else if (obj_T == "ARDOUR::TempoMap") {
 	    return new MementoCommand<TempoMap>(*_tempo_map, before, after);
 
-    } else if (obj_T == typeid (Playlist).name() || obj_T == typeid (AudioPlaylist).name() || obj_T == typeid (MidiPlaylist).name()) {
+    } else if (obj_T == "ARDOUR::Playlist" || obj_T == "ARDOUR::AudioPlaylist" || obj_T == "ARDOUR::MidiPlaylist") {
 	    if (boost::shared_ptr<Playlist> pl = playlists->by_name(child->property("name")->value())) {
 		    return new MementoCommand<Playlist>(*(pl.get()), before, after);
 	    }
 
-    } else if (obj_T == typeid (Route).name() || obj_T == typeid (AudioTrack).name() || obj_T == typeid(MidiTrack).name()) {
+    } else if (obj_T == "ARDOUR::Route" || obj_T == "ARDOUR::AudioTrack" || obj_T == "ARDOUR::MidiTrack") {
 		if (boost::shared_ptr<Route> r = route_by_id(id)) {
 			return new MementoCommand<Route>(*r, before, after);
 		} else {
 			error << string_compose (X_("Route %1 not found in session"), id) << endmsg;
 		}
 
-    } else if (obj_T == typeid (Evoral::Curve).name() || obj_T == typeid (AutomationList).name()) {
-		std::map<PBD::ID, AutomationList*>::iterator i = automation_lists.find(id);
-		if (i != automation_lists.end()) {
-		    return new MementoCommand<AutomationList>(*i->second, before, after);
-		}
+    } else if (obj_T == "Evoral::Curve" || obj_T == "ARDOUR::AutomationList") {
+	    if (have_id) {
+		    std::map<PBD::ID, AutomationList*>::iterator i = automation_lists.find(id);
+		    if (i != automation_lists.end()) {
+			    return new MementoCommand<AutomationList>(*i->second, before, after);
+		    }
+	    } else {
+		    return new MementoCommand<AutomationList> (
+			    new MidiAutomationListBinder (n, sources),
+			    before, after
+			    );
+	    }
+
+	    cerr << "Alist " << id << " not found\n";
+
+    } else if (obj_T == "ARDOUR::Crossfade") {
+	    if (have_id) {
+		    boost::shared_ptr<Crossfade> c = playlists->find_crossfade (id);
+		    if (c) {
+			    return new MementoCommand<Crossfade> (*c.get(), before, after);
+		    }
+	    } else {
+		    return new MementoCommand<Crossfade> (
+			    new CrossfadeBinder (n, playlists),
+			    before, after
+			    );
+	    }
+
     } else if (registry.count(id)) { // For Editor and AutomationLine which are off-limits herea
 	    return new MementoCommand<PBD::StatefulDestructible>(*registry[id], before, after);
     }
@@ -141,18 +172,26 @@ Session::stateful_diff_command_factory (XMLNode* n)
 	PBD::ID const id (n->property("obj-id")->value ());
 
 	string const obj_T = n->property ("type-name")->value ();
-	if ((obj_T == typeid (AudioRegion).name() || obj_T == typeid (MidiRegion).name())) {
+	if ((obj_T == "ARDOUR::AudioRegion" || obj_T == "ARDOUR::MidiRegion")) {
 		boost::shared_ptr<Region> r = RegionFactory::region_by_id (id);
 		if (r) {
 			return new StatefulDiffCommand (r, *n);
 		}
-	}
+
+	} else if (obj_T == "ARDOUR::AudioPlaylist" ||  obj_T == "ARDOUR::MidiPlaylist") {
+                boost::shared_ptr<Playlist> p = playlists->by_id (id);
+                if (p) {
+                        return new StatefulDiffCommand (p, *n);
+                } else {
+                        cerr << "Playlist with ID = " << id << " not found\n";
+                }
+        }
 
 	/* we failed */
-	
+
 	error << string_compose (
 		_("could not reconstitute StatefulDiffCommand from XMLNode. object type = %1 id = %2"), obj_T, id.to_s())
 	      << endmsg;
-	
+
 	return 0;
 }