Some improvements to performance with crossfades: don't recompute a whole track's...

[ardour.git] / libs / ardour / session_command.cc

diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index e8670e719923c8bd5fbda3d9a1dd9fc44c913364..4af18fcd12948c4b8274493813de07226fb5ff7b 100644 (file)
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -17,24 +17,25 @@
 
 */
 
-#include <ardour/session.h>
-#include <ardour/route.h>
-#include <pbd/memento_command.h>
-#include <ardour/diskstream.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 <pbd/error.h>
-#include <pbd/id.h>
-#include <pbd/statefuldestructible.h>
-#include <pbd/failed_constructor.h>
+#include "ardour/session.h"
+#include "ardour/route.h"
+#include "pbd/memento_command.h"
+#include "ardour/diskstream.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 "pbd/error.h"
+#include "pbd/id.h"
+#include "pbd/statefuldestructible.h"
+#include "pbd/failed_constructor.h"
+#include "evoral/Curve.hpp"
 
 using namespace PBD;
 using namespace ARDOUR;
@@ -54,7 +55,7 @@ Session::memento_command_factory(XMLNode *n)
     XMLNode *child = 0;
 
     /* get id */
-    id = PBD::ID(n->property("obj_id")->value());
+    id = PBD::ID(n->property("obj-id")->value());
 
     /* get before/after */
 
@@ -72,16 +73,15 @@ Session::memento_command_factory(XMLNode *n)
            before = new XMLNode(*n->children().front());
            after = new XMLNode(*n->children().back());
            child = before;
-    }
+    } 
                    
-    if (!child)
-    {
+    if (!child) {
        error << _("Tried to reconstitute a MementoCommand with no contents, failing. id=") << id.to_s() << endmsg;
        return 0;
     }
 
     /* create command */
-    string obj_T = n->property ("type_name")->value();
+    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);
@@ -103,10 +103,16 @@ Session::memento_command_factory(XMLNode *n)
                    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()) { 
-           return new MementoCommand<Route>(*route_by_id(id), before, after);
-    } else if (obj_T == typeid (Curve).name() || obj_T == typeid (AutomationList).name()) {
-           if (automation_lists.count(id))
-                   return new MementoCommand<AutomationList>(*automation_lists[id], before, after);
+               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);
     }