resolve merge with master (?)

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

diff --git a/libs/pbd/pbd/undo.h b/libs/pbd/pbd/undo.h
index 724e86aaa05ccfa58a898babf351a313be08b45e..e9582a1b53dd40cdc9308bbf7097fa7c2e0f69da 100644 (file)
--- a/libs/pbd/pbd/undo.h
+++ b/libs/pbd/pbd/undo.h
@@ -1,5 +1,5 @@
 /* 
-   Copyright (C) 2002 Brett Viren & Paul Davis
+    Copyright (C) 2002 Brett Viren & Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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__
@@ -26,11 +25,13 @@
 #include <map>
 #include <sigc++/slot.h>
 #include <sigc++/bind.h>
+#ifndef  COMPILER_MSVC
 #include <sys/time.h>
-#include <pbd/command.h>
+#else
+#include <ardourext/misc.h>
+#endif
 
-using std::string;
-using std::list;
+#include "pbd/command.h"
 
 typedef sigc::slot<void> UndoAction;
 
@@ -40,21 +41,20 @@ 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 operator() ();
        void undo();
        void redo();
 
        XMLNode &get_state();
-       
-       void set_name (const string& str) {
-               _name = str;
-       }
-       const string& name() const { return _name; }
 
        void set_timestamp (struct timeval &t) {
                _timestamp = t;
@@ -65,36 +65,59 @@ class UndoTransaction : public Command
        }
 
   private:
-       list<Command*>   actions;
-       struct timeval   _timestamp;
-       string           _name;
+       std::list<Command*>    actions;
+       struct timeval        _timestamp;
+       bool                  _clearing;
+
+       friend void command_death (UndoTransaction*, Command *);
+       
+       void about_to_explicitly_delete ();
 };
 
-class UndoHistory
+class UndoHistory : public PBD::ScopedConnectionList
 {
   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();
+       /* returns all or part of the history.
+          If depth==0 it returns just the top
+          node. If depth<0, it returns everything.
+          If depth>0, it returns state for that
+          many elements of the history, or 
+          the full history, whichever is smaller.
+       */
+
+        XMLNode &get_state(int32_t depth = 0);
         void save_state();
+
+       void set_depth (uint32_t);
+
+       PBD::Signal0<void> Changed;
+       PBD::Signal0<void> BeginUndoRedo;
+       PBD::Signal0<void> EndUndoRedo;
+       
   private:
-       list<UndoTransaction> UndoList;
-       list<UndoTransaction> RedoList;
+       bool _clearing;
+       uint32_t _depth;
+       std::list<UndoTransaction*> UndoList;
+       std::list<UndoTransaction*> RedoList;
+
+       void remove (UndoTransaction*);
 };