*/
-#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/midi_automation_list_binder.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"
+#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::StatefulDestructible *ptr)
{
XMLNode *before = 0, *after = 0;
XMLNode *child = 0;
- /* get id */
-
/* XXX: HACK! */
- bool have_id = n->property("obj-id") != 0;
- if (have_id) {
- id = PBD::ID(n->property("obj-id")->value());
- }
+ bool have_id = n->get_property ("obj-id", id);
/* get before/after */
}
if (!child) {
- error << _("Tried to reconstitute a MementoCommand with no contents, failing. id=") << id.to_s() << endmsg;
- return 0;
+ info << 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 type_name;
+ n->get_property ("type-name", type_name);
- if (obj_T == "ARDOUR::AudioRegion" || obj_T == "ARDOUR::MidiRegion" || obj_T == "ARDOUR::Region") {
+ 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 == "ARDOUR::AudioSource" || obj_T == "ARDOUR::MidiSource") {
+ } 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 == "ARDOUR::Location") {
+ } 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 == "ARDOUR::Locations") {
+ } else if (type_name == "ARDOUR::Locations") {
return new MementoCommand<Locations>(*_locations, before, after);
- } else if (obj_T == "ARDOUR::TempoMap") {
+ } else if (type_name == "ARDOUR::TempoMap") {
return new MementoCommand<TempoMap>(*_tempo_map, before, after);
- } else if (obj_T == "ARDOUR::Playlist" || obj_T == "ARDOUR::AudioPlaylist" || obj_T == "ARDOUR::MidiPlaylist") {
+ } 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 == "ARDOUR::Route" || obj_T == "ARDOUR::AudioTrack" || obj_T == "ARDOUR::MidiTrack") {
+ } 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 == "Evoral::Curve" || obj_T == "ARDOUR::AutomationList") {
+ } 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()) {
);
}
- cerr << "Alist " << id << " not found\n";
+ 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 const id (n->property("obj-id")->value ());
-
- string const obj_T = n->property ("type-name")->value ();
- if ((obj_T == "ARDOUR::AudioRegion" || obj_T == "ARDOUR::MidiRegion")) {
+ 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 (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";
- }
- }
+ } 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"), obj_T, id.to_s())
+ info << string_compose (
+ _("Could not reconstitute StatefulDiffCommand from XMLNode. object type = %1 id = %2"), type_name, id.to_s())
<< endmsg;
return 0;
projects / ardour.git / blobdiff