X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_command.cc;h=18f282f569c0987028e240a527f096c8c67eb879;hb=a5836e2922c1330f00956415465d2f186596c409;hp=4d733264fbc38752e309bd96ddacedf466de467c;hpb=90d6916ca3443b81a4eaf615c014ac065554b4f2;p=ardour.git

diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index 4d733264fb..18f282f569 100644
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -17,33 +17,36 @@
 
 */
 
-#include "ardour/session.h"
-#include "ardour/route.h"
-#include "pbd/memento_command.h"
-#include "ardour/diskstream.h"
+#include <string>
+
+#include "ardour/automation_list.h"
+#include "ardour/location.h"
+#include "ardour/midi_automation_list_binder.h"
 #include "ardour/playlist.h"
-#include "ardour/audioplaylist.h"
-#include "ardour/audio_track.h"
-#include "ardour/midi_playlist.h"
-#include "ardour/midi_track.h"
-#include "ardour/tempo.h"
-#include "ardour/audiosource.h"
-#include "ardour/audioregion.h"
-#include "ardour/midi_source.h"
-#include "ardour/midi_region.h"
+#include "ardour/region.h"
+#include "ardour/region_factory.h"
+#include "ardour/route.h"
+#include "ardour/session.h"
 #include "ardour/session_playlists.h"
+#include "ardour/source.h"
+#include "ardour/tempo.h"
+#include "evoral/Curve.hpp"
 #include "pbd/error.h"
+#include "pbd/failed_constructor.h"
 #include "pbd/id.h"
+#include "pbd/memento_command.h"
+#include "pbd/stateful_diff_command.h"
 #include "pbd/statefuldestructible.h"
-#include "pbd/failed_constructor.h"
-#include "evoral/Curve.hpp"
+#include "pbd/types_convert.h"
+
+class Command;
 
 using namespace PBD;
 using namespace ARDOUR;
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
-void Session::register_with_memento_command_factory(PBD::ID id, PBD::StatefulThingWithGoingAway *ptr)
+void Session::register_with_memento_command_factory(PBD::ID id, PBD::StatefulDestructible *ptr)
 {
     registry[id] = ptr;
 }
@@ -55,8 +58,8 @@ Session::memento_command_factory(XMLNode *n)
     XMLNode *before = 0, *after = 0;
     XMLNode *child = 0;
 
-    /* get id */
-    id = PBD::ID(n->property("obj-id")->value());
+    /* XXX: HACK! */
+    bool have_id = n->get_property ("obj-id", id);
 
     /* get before/after */
 
@@ -77,50 +80,104 @@ Session::memento_command_factory(XMLNode *n)
     }
 
     if (!child) {
-	error << _("Tried to reconstitute a MementoCommand with no contents, failing. id=") << id.to_s() << endmsg;
-	return 0;
+	    error << string_compose (_("Tried to reconstitute a MementoCommand with no contents, failing. id=%1"), id.to_s()) << endmsg;
+	    return 0;
     }
 
     /* 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 (regions.count(id)) {
-		    return new MementoCommand<Region>(*regions[id], before, after);
+    std::string type_name;
+    n->get_property ("type-name", type_name);
+
+    if (type_name == "ARDOUR::AudioRegion" || type_name == "ARDOUR::MidiRegion" || type_name == "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 (type_name == "ARDOUR::AudioSource" || type_name == "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 (type_name == "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 == typeid (TempoMap).name()) {
+
+    } else if (type_name == "ARDOUR::Locations") {
+	    return new MementoCommand<Locations>(*_locations, before, after);
+
+    } else if (type_name == "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 (type_name == "ARDOUR::Playlist" || type_name == "ARDOUR::AudioPlaylist" || type_name == "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 (type_name == "ARDOUR::Route" || type_name == "ARDOUR::AudioTrack" || type_name == "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 (registry.count(id)) { // For Editor and AutomationLine which are off-limits here
-	    return new MementoCommand<PBD::StatefulThingWithGoingAway>(*registry[id], before, after);
+
+    } else if (type_name == "Evoral::Curve" || type_name == "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
+			    );
+	    }
+
+	    std::cerr << "Alist " << id << " not found\n";
+
+    } else if (registry.count(id)) { // For Editor and AutomationLine which are off-limits herea
+	    return new MementoCommand<PBD::StatefulDestructible>(*registry[id], before, after);
     }
 
     /* we failed */
-    error << string_compose (_("could not reconstitute MementoCommand from XMLNode. object type = %1 id = %2"), obj_T, id.to_s()) << endmsg;
+    info << string_compose (_("could not reconstitute MementoCommand from XMLNode. object type = %1 id = %2"), type_name, id.to_s()) << endmsg;
 
     return 0 ;
 }
 
+Command *
+Session::stateful_diff_command_factory (XMLNode* n)
+{
+	PBD::ID id;
+	std::string type_name;
+	if (!n->get_property ("obj-id", id) || !n->get_property ("type-name", type_name)) {
+		error << _("Could get object ID and type name for StatefulDiffCommand from XMLNode.")
+		      << endmsg;
+		      return 0;
+	}
+
+	if ((type_name == "ARDOUR::AudioRegion" || type_name == "ARDOUR::MidiRegion")) {
+		boost::shared_ptr<Region> r = RegionFactory::region_by_id (id);
+		if (r) {
+			return new StatefulDiffCommand (r, *n);
+		}
+
+	} else if (type_name == "ARDOUR::AudioPlaylist" ||  type_name == "ARDOUR::MidiPlaylist") {
+		boost::shared_ptr<Playlist> p = playlists->by_id (id);
+		if (p) {
+			return new StatefulDiffCommand (p, *n);
+		} else {
+			std::cerr << "Playlist with ID = " << id << " not found\n";
+		}
+	}
+
+	/* we failed */
+
+	error << string_compose (
+		_("could not reconstitute StatefulDiffCommand from XMLNode. object type = %1 id = %2"), type_name, id.to_s())
+	      << endmsg;
+
+	return 0;
+}