Improved ExportProfileManager error handling, and added some missing (?) initialization

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

diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index b9a0e2cb6009b8786d5988afd105643af164cae1..b696f7d410a6b0f6c3ed61a6b4bc6e1e96239b6b 100644 (file)
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -24,9 +24,13 @@
 #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>
@@ -68,7 +72,7 @@ Session::memento_command_factory(XMLNode *n)
            before = new XMLNode(*n->children().front());
            after = new XMLNode(*n->children().back());
            child = before;
-    }
+    } 
                    
     if (!child)
     {
@@ -78,26 +82,29 @@ 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 (Region).name()) {
-           if (audio_regions.count(id)) {
-                   return new MementoCommand<AudioRegion>(*audio_regions[id], before, after);
+    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);
            }
-    } else if (obj_T == typeid (AudioSource).name()) {
-           if (audio_sources.count(id))
-                   return new MementoCommand<AudioSource>(*audio_sources[id], before, after);
+    } else if (obj_T == typeid (AudioSource).name() || obj_T == typeid (MidiSource).name()) {
+           if (sources.count(id))
+                   return new MementoCommand<Source>(*sources[id], before, after);
     } else if (obj_T == typeid (Location).name()) {
-           return new MementoCommand<Location>(*_locations.get_location_by_id(id), before, after);
+           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()) {
            return new MementoCommand<TempoMap>(*_tempo_map, before, after);
-    } else if (obj_T == typeid (Playlist).name() || obj_T == typeid (AudioPlaylist).name()) {
+    } else if (obj_T == typeid (Playlist).name() || obj_T == typeid (AudioPlaylist).name() || obj_T == typeid (MidiPlaylist).name()) {
            if (boost::shared_ptr<Playlist> pl = playlist_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()) { 
+    } 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()) {
+    } else if (obj_T == typeid (Evoral::Curve).name() || obj_T == typeid (AutomationList).name()) {
            if (automation_lists.count(id))
                    return new MementoCommand<AutomationList>(*automation_lists[id], before, after);
     } else if (registry.count(id)) { // For Editor and AutomationLine which are off-limits here