-/*
+/*
Copyright (C) 2006 Paul Davis
Author: Hans Fugal
}
void add_state (XMLNode* node) {
- node->add_property ("obj_id", _object.id().to_s());
+ node->set_property ("obj_id", _object.id().to_s());
}
-
+
void object_died () {
/* The object we are binding died, so drop references to ourselves */
this->drop_references ();
PBD::ScopedConnection _object_death_connection;
};
-/** This command class is initialized with before and after mementos
+/** This command class is initialized with before and after mementos
* (from Stateful::get_state()), so undo becomes restoring the before
* memento, and redo is restoring the after memento.
*/
class LIBPBD_TEMPLATE_API MementoCommand : public Command
{
public:
- MementoCommand (obj_T& a_object, XMLNode* a_before, XMLNode* a_after)
+ MementoCommand (obj_T& a_object, XMLNode* a_before, XMLNode* a_after)
: _binder (new SimpleMementoCommandBinder<obj_T> (a_object)), before (a_before), after (a_after)
{
/* The binder's object died, so we must die */
_binder->DropReferences.connect_same_thread (_binder_death_connection, boost::bind (&MementoCommand::binder_dying, this));
}
- MementoCommand (MementoCommandBinder<obj_T>* b, XMLNode* a_before, XMLNode* a_after)
+ MementoCommand (MementoCommandBinder<obj_T>* b, XMLNode* a_before, XMLNode* a_after)
: _binder (b), before (a_before), after (a_after)
{
/* The binder's object died, so we must die */
_binder->DropReferences.connect_same_thread (_binder_death_connection, boost::bind (&MementoCommand::binder_dying, this));
}
-
+
~MementoCommand () {
drop_references ();
delete before;
void operator() () {
if (after) {
- _binder->get()->set_state(*after, Stateful::current_state_version);
+ _binder->get()->set_state(*after, Stateful::current_state_version);
}
}
- void undo() {
+ void undo() {
if (before) {
- _binder->get()->set_state(*before, Stateful::current_state_version);
+ _binder->get()->set_state(*before, Stateful::current_state_version);
}
}
XMLNode* node = new XMLNode(name);
_binder->add_state (node);
-
- node->add_property ("type_name", _binder->type_name ());
+
+ node->set_property ("type_name", _binder->type_name ());
if (before) {
node->add_child_copy(*before);
}
-
+
if (after) {
node->add_child_copy(*after);
}