diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-08-25 01:07:15 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-08-25 01:07:15 +0000 |
commit | ce234f363e95c38fc92728e520bf5ba240a89aa7 (patch) | |
tree | 96ce8c4734bdd564ec1f2ad0c36bc32f0b108204 /libs/pbd/undo.cc | |
parent | 7e95f29ce95edf01d6d451f96fae03f3d3451ff8 (diff) |
use shared_ptr<> for all region handling
git-svn-id: svn://localhost/ardour2/trunk@852 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/pbd/undo.cc')
-rw-r--r-- | libs/pbd/undo.cc | 78 |
1 files changed, 64 insertions, 14 deletions
diff --git a/libs/pbd/undo.cc b/libs/pbd/undo.cc index 6f421de84e..717c355bae 100644 --- a/libs/pbd/undo.cc +++ b/libs/pbd/undo.cc @@ -19,26 +19,36 @@ */ #include <iostream> +#include <string> +#include <sstream> #include <pbd/undo.h> #include <pbd/xml++.h> -#include <string> -#include <sstream> + +#include <sigc++/bind.h> using namespace std; using namespace sigc; UndoTransaction::UndoTransaction () { + clearing = false; } UndoTransaction::UndoTransaction (const UndoTransaction& rhs) { _name = rhs._name; + clearing = false; clear (); actions.insert(actions.end(),rhs.actions.begin(),rhs.actions.end()); } +UndoTransaction::~UndoTransaction () +{ + GoingAway (); + clear (); +} + UndoTransaction& UndoTransaction::operator= (const UndoTransaction& rhs) { @@ -52,13 +62,31 @@ UndoTransaction::operator= (const UndoTransaction& rhs) void UndoTransaction::add_command (Command *const action) { + action->GoingAway.connect (bind (mem_fun (*this, &UndoTransaction::remove_command), action)); actions.push_back (action); } void +UndoTransaction::remove_command (Command* const action) +{ + if (clearing) { + return; + } + actions.remove (action); + if (actions.empty()) { + delete this; + } +} + +void UndoTransaction::clear () { + clearing = true; + for (list<Command*>::iterator i = actions.begin(); i != actions.end(); ++i) { + delete *i; + } actions.clear (); + clearing = false; } void @@ -72,7 +100,6 @@ UndoTransaction::operator() () void UndoTransaction::undo () { - cerr << "Undo " << _name << endl; for (list<Command*>::reverse_iterator i = actions.rbegin(); i != actions.rend(); ++i) { (*i)->undo(); } @@ -81,7 +108,6 @@ UndoTransaction::undo () void UndoTransaction::redo () { - cerr << "Redo " << _name << endl; (*this)(); } @@ -103,10 +129,29 @@ XMLNode &UndoTransaction::get_state() return *node; } +UndoHistory::UndoHistory () +{ + clearing = false; +} + void -UndoHistory::add (UndoTransaction ut) +UndoHistory::add (UndoTransaction* const ut) { + ut->GoingAway.connect (bind (mem_fun (*this, &UndoHistory::remove), ut)); UndoList.push_back (ut); + + /* we are now owners of the transaction */ +} + +void +UndoHistory::remove (UndoTransaction* const ut) +{ + if (clearing) { + return; + } + + UndoList.remove (ut); + RedoList.remove (ut); } void @@ -116,9 +161,9 @@ UndoHistory::undo (unsigned int n) if (UndoList.size() == 0) { return; } - UndoTransaction ut = UndoList.back (); + UndoTransaction* ut = UndoList.back (); UndoList.pop_back (); - ut.undo (); + ut->undo (); RedoList.push_back (ut); } } @@ -130,9 +175,9 @@ UndoHistory::redo (unsigned int n) if (RedoList.size() == 0) { return; } - UndoTransaction ut = RedoList.back (); + UndoTransaction* ut = RedoList.back (); RedoList.pop_back (); - ut.redo (); + ut->redo (); UndoList.push_back (ut); } } @@ -140,29 +185,34 @@ UndoHistory::redo (unsigned int n) void UndoHistory::clear_redo () { + clearing = true; RedoList.clear (); + clearing = false; } void UndoHistory::clear_undo () { + clearing = true; UndoList.clear (); + clearing = false; } void UndoHistory::clear () { - RedoList.clear (); - UndoList.clear (); + clear_undo (); + clear_redo (); } XMLNode & UndoHistory::get_state() { XMLNode *node = new XMLNode ("UndoHistory"); - list<UndoTransaction>::iterator it; - for (it=UndoList.begin(); it != UndoList.end(); it++) - node->add_child_nocopy(it->get_state()); + list<UndoTransaction*>::iterator it; + for (it = UndoList.begin(); it != UndoList.end(); it++) { + node->add_child_nocopy((*it)->get_state()); + } return *node; } |