X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fundo.cc;h=42f7d574ea4030f44f486215901dedba64c0af25;hb=92848355801abdfcb81d620cd0adeeea74a3accd;hp=a0e98f9a132029a2b62b06967cf22bf4546420dd;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git diff --git a/libs/pbd/undo.cc b/libs/pbd/undo.cc index a0e98f9a13..42f7d574ea 100644 --- a/libs/pbd/undo.cc +++ b/libs/pbd/undo.cc @@ -40,13 +40,14 @@ UndoTransaction::UndoTransaction (const UndoTransaction& rhs) : Command(rhs._name) , _clearing(false) { + _timestamp = rhs._timestamp; clear (); actions.insert(actions.end(),rhs.actions.begin(),rhs.actions.end()); } UndoTransaction::~UndoTransaction () { - GoingAway (); + drop_references (); clear (); } @@ -75,13 +76,15 @@ UndoTransaction::operator= (const UndoTransaction& rhs) } void -UndoTransaction::add_command (Command *const action) +UndoTransaction::add_command (Command *const cmd) { /* catch death of command (e.g. caused by death of object to - which it refers. + which it refers. command_death() is a normal static function + so there is no need to manage this connection. */ - shivas.push_back (new PBD::ProxyShiva (*action, *this, &command_death)); - actions.push_back (action); + + cmd->DropReferences.connect_same_thread (*this, boost::bind (&command_death, this, cmd)); + actions.push_back (cmd); } void @@ -90,21 +93,6 @@ UndoTransaction::remove_command (Command* const action) actions.remove (action); } -void -UndoTransaction::about_to_explicitly_delete () -{ - /* someone is going to call our destructor and its not Shiva, - the god of destruction and chaos. This happens when an UndoHistory - is pruning itself. we must remove Shivas to avoid the god - striking us down a second time, unnecessarily and illegally. - */ - - for (list*>::iterator i = shivas.begin(); i != shivas.end(); ++i) { - delete *i; - } - shivas.clear (); -} - bool UndoTransaction::empty () const { @@ -162,6 +150,20 @@ XMLNode &UndoTransaction::get_state() return *node; } +class UndoRedoSignaller { +public: + UndoRedoSignaller (UndoHistory& uh) + : _history (uh) { + _history.BeginUndoRedo(); + } + ~UndoRedoSignaller() { + _history.EndUndoRedo(); + } + +private: + UndoHistory& _history; +}; + UndoHistory::UndoHistory () { _clearing = false; @@ -188,7 +190,6 @@ UndoHistory::set_depth (uint32_t d) while (cnt--) { ut = UndoList.front(); UndoList.pop_front (); - ut->about_to_explicitly_delete (); delete ut; } } @@ -199,7 +200,7 @@ UndoHistory::add (UndoTransaction* const ut) { uint32_t current_depth = UndoList.size(); - ut->GoingAway.connect (bind (mem_fun (*this, &UndoHistory::remove), ut)); + ut->DropReferences.connect_same_thread (*this, boost::bind (&UndoHistory::remove, this, ut)); /* if the current undo history is larger than or equal to the currently requested depth, then pop off at least 1 element to make space @@ -214,7 +215,6 @@ UndoHistory::add (UndoTransaction* const ut) UndoTransaction* ut; ut = UndoList.front (); UndoList.pop_front (); - ut->about_to_explicitly_delete (); delete ut; } } @@ -245,14 +245,22 @@ UndoHistory::remove (UndoTransaction* const ut) void UndoHistory::undo (unsigned int n) { - while (n--) { - if (UndoList.size() == 0) { - return; + if (n == 0) { + return; + } + + { + UndoRedoSignaller exception_safe_signaller (*this); + + while (n--) { + if (UndoList.size() == 0) { + return; + } + UndoTransaction* ut = UndoList.back (); + UndoList.pop_back (); + ut->undo (); + RedoList.push_back (ut); } - UndoTransaction* ut = UndoList.back (); - UndoList.pop_back (); - ut->undo (); - RedoList.push_back (ut); } Changed (); /* EMIT SIGNAL */ @@ -261,14 +269,22 @@ UndoHistory::undo (unsigned int n) void UndoHistory::redo (unsigned int n) { - while (n--) { - if (RedoList.size() == 0) { - return; + if (n == 0) { + return; + } + + { + UndoRedoSignaller exception_safe_signaller (*this); + + while (n--) { + if (RedoList.size() == 0) { + return; + } + UndoTransaction* ut = RedoList.back (); + RedoList.pop_back (); + ut->redo (); + UndoList.push_back (ut); } - UndoTransaction* ut = RedoList.back (); - RedoList.pop_back (); - ut->redo (); - UndoList.push_back (ut); } Changed (); /* EMIT SIGNAL */ @@ -278,6 +294,9 @@ void UndoHistory::clear_redo () { _clearing = true; + for (std::list::iterator i = RedoList.begin(); i != RedoList.end(); ++i) { + delete *i; + } RedoList.clear (); _clearing = false; @@ -289,6 +308,9 @@ void UndoHistory::clear_undo () { _clearing = true; + for (std::list::iterator i = UndoList.begin(); i != UndoList.end(); ++i) { + delete *i; + } UndoList.clear (); _clearing = false;