X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_command.cc;h=a99738a613dea2bab463323c5ee49d23012a4613;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=17ffa1e26dce27c2b3aadf5650774ebee1df0366;hpb=3a85e71031bc26d67d66db985da2159415f84fdb;p=ardour.git

diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index 17ffa1e26d..a99738a613 100644
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -17,33 +17,33 @@
 
 */
 
-#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/session_playlists.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/id.h"
-#include "pbd/statefuldestructible.h"
 #include "pbd/failed_constructor.h"
+#include "pbd/id.h"
+#include "pbd/memento_command.h"
 #include "pbd/stateful_diff_command.h"
-#include "evoral/Curve.hpp"
+#include "pbd/statefuldestructible.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::StatefulDestructible *ptr)
 {
@@ -58,7 +58,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 */
 
@@ -79,12 +84,12 @@ 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();
+    std::string obj_T = n->property ("type-name")->value();
 
     if (obj_T == "ARDOUR::AudioRegion" || obj_T == "ARDOUR::MidiRegion" || obj_T == "ARDOUR::Region") {
 	    boost::shared_ptr<Region> r = RegionFactory::region_by_id (id);
@@ -97,13 +102,13 @@ Session::memento_command_factory(XMLNode *n)
 		    return new MementoCommand<Source>(*sources[id], before, after);
 
     } else if (obj_T == "ARDOUR::Location") {
-	    Location* loc = _locations.get_location_by_id(id);
+	    Location* loc = _locations->get_location_by_id(id);
 	    if (loc) {
 		    return new MementoCommand<Location>(*loc, before, after);
 	    }
 
     } else if (obj_T == "ARDOUR::Locations") {
-	    return new MementoCommand<Locations>(_locations, before, after);
+	    return new MementoCommand<Locations>(*_locations, before, after);
 
     } else if (obj_T == "ARDOUR::TempoMap") {
 	    return new MementoCommand<TempoMap>(*_tempo_map, before, after);
@@ -121,17 +126,26 @@ Session::memento_command_factory(XMLNode *n)
 		}
 
     } else if (obj_T == "Evoral::Curve" || obj_T == "ARDOUR::AutomationList") {
-		std::map<PBD::ID, AutomationList*>::iterator i = automation_lists.find(id);
-		if (i != automation_lists.end()) {
-		    return new MementoCommand<AutomationList>(*i->second, before, after);
-		}
-                cerr << "Alist not found\n";
+	    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"), obj_T, id.to_s()) << endmsg;
 
     return 0 ;
 }
@@ -141,7 +155,7 @@ 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 ();
+	std::string const obj_T = n->property ("type-name")->value ();
 	if ((obj_T == "ARDOUR::AudioRegion" || obj_T == "ARDOUR::MidiRegion")) {
 		boost::shared_ptr<Region> r = RegionFactory::region_by_id (id);
 		if (r) {
@@ -149,19 +163,19 @@ Session::stateful_diff_command_factory (XMLNode* 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";
-                }
-        }
+		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"), obj_T, id.to_s())
 	      << endmsg;
-	
+
 	return 0;
 }