Minor cleanup.
[ardour.git] / libs / ardour / session_command.cc
index dc918dfe1cd77a4cdb15bcdcbcb17d52b01a4624..17c7d559d4795bf25efbf1fc882c90700665318b 100644 (file)
@@ -34,6 +34,7 @@
 #include "ardour/session_playlists.h"
 #include "ardour/region_factory.h"
 #include "ardour/midi_automation_list_binder.h"
+#include "ardour/crossfade.h"
 #include "pbd/error.h"
 #include "pbd/id.h"
 #include "pbd/statefuldestructible.h"
@@ -103,13 +104,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);
@@ -140,7 +141,15 @@ Session::memento_command_factory(XMLNode *n)
            }
            
            cerr << "Alist not found\n";
-           
+
+    } else if (obj_T == "ARDOUR::Crossfade") {
+           boost::shared_ptr<Crossfade> c = playlists->find_crossfade (id);
+           if (c) {
+                   return new MementoCommand<Crossfade> (*c.get(), before, after);
+           } else {
+                   error << string_compose (X_("Crossfade %1 not found in session"), id) << endmsg;
+           }
+
     } else if (registry.count(id)) { // For Editor and AutomationLine which are off-limits herea
            return new MementoCommand<PBD::StatefulDestructible>(*registry[id], before, after);
     }