Merged with trunk R1612.

[ardour.git] / libs / pbd / pbd / undo.h

diff --git a/libs/pbd/pbd/undo.h b/libs/pbd/pbd/undo.h
index 724e86aaa05ccfa58a898babf351a313be08b45e..9539d8b41dc734fd8ac88bcc33c1186d177de734 100644 (file)
--- a/libs/pbd/pbd/undo.h
+++ b/libs/pbd/pbd/undo.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __lib_pbd_undo_h__
@@ -29,9 +28,6 @@
 #include <sys/time.h>
 #include <pbd/command.h>
 
-using std::string;
-using std::list;
-
 typedef sigc::slot<void> UndoAction;
 
 class UndoTransaction : public Command
@@ -40,10 +36,14 @@ class UndoTransaction : public Command
        UndoTransaction ();
        UndoTransaction (const UndoTransaction&);
        UndoTransaction& operator= (const UndoTransaction&);
+       ~UndoTransaction ();
 
        void clear ();
+       bool empty() const;
+       bool clearing () const { return _clearing; }
 
-       void add_command (Command *const);
+       void add_command (Command* const);
+       void remove_command (Command* const);
 
         void operator() ();
        void undo();
@@ -51,10 +51,10 @@ class UndoTransaction : public Command
 
        XMLNode &get_state();
        
-       void set_name (const string& str) {
+       void set_name (const std::string& str) {
                _name = str;
        }
-       const string& name() const { return _name; }
+       const std::string& name() const { return _name; }
 
        void set_timestamp (struct timeval &t) {
                _timestamp = t;
@@ -65,36 +65,45 @@ class UndoTransaction : public Command
        }
 
   private:
-       list<Command*>   actions;
-       struct timeval   _timestamp;
-       string           _name;
+       std::list<Command*>    actions;
+       struct timeval        _timestamp;
+       std::string           _name;
+       bool                  _clearing;
+
+       friend void command_death (UndoTransaction*, Command *);
 };
 
-class UndoHistory
+class UndoHistory : public sigc::trackable
 {
   public:
-       UndoHistory() {}
+       UndoHistory();
        ~UndoHistory() {}
        
-       void add (UndoTransaction ut);
+       void add (UndoTransaction* ut);
        void undo (unsigned int n);
        void redo (unsigned int n);
        
        unsigned long undo_depth() const { return UndoList.size(); }
        unsigned long redo_depth() const { return RedoList.size(); }
        
-       string next_undo() const { return (UndoList.empty() ? string("") : UndoList.back().name()); }
-       string next_redo() const { return (RedoList.empty() ? string("") : RedoList.back().name()); }
+       std::string next_undo() const { return (UndoList.empty() ? std::string("") : UndoList.back()->name()); }
+       std::string next_redo() const { return (RedoList.empty() ? std::string("") : RedoList.back()->name()); }
 
        void clear ();
        void clear_undo ();
        void clear_redo ();
 
-        XMLNode &get_state();
+        XMLNode &get_state(uint32_t depth = 0);
         void save_state();
+
+       sigc::signal<void> Changed;
+
   private:
-       list<UndoTransaction> UndoList;
-       list<UndoTransaction> RedoList;
+       bool _clearing;
+       std::list<UndoTransaction*> UndoList;
+       std::list<UndoTransaction*> RedoList;
+
+       void remove (UndoTransaction*);
 };