Merge branch 'master' into windows

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

diff --git a/libs/pbd/pbd/undo.h b/libs/pbd/pbd/undo.h
index 8f1716d09f45e0fe517d2b64eecb2c90b726b7c0..11ff2bf321b806106001ce8a9f27d768b890c86a 100644 (file)
--- a/libs/pbd/pbd/undo.h
+++ b/libs/pbd/pbd/undo.h
@@ -26,7 +26,8 @@
 #include <sigc++/slot.h>
 #include <sigc++/bind.h>
 #include <sys/time.h>
-#include <pbd/command.h>
+
+#include "pbd/command.h"
 
 typedef sigc::slot<void> UndoAction;
 
@@ -65,9 +66,11 @@ class UndoTransaction : public Command
        bool                  _clearing;
 
        friend void command_death (UndoTransaction*, Command *);
+       
+       void about_to_explicitly_delete ();
 };
 
-class UndoHistory : public sigc::trackable
+class UndoHistory : public PBD::ScopedConnectionList
 {
   public:
        UndoHistory();
@@ -87,17 +90,26 @@ class UndoHistory : public sigc::trackable
        void clear_undo ();
        void clear_redo ();
 
+       /* 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 (int32_t);
-       int32_t get_depth() const { return _depth; }
+       void set_depth (uint32_t);
 
-       sigc::signal<void> Changed;
+       PBD::Signal0<void> Changed;
+       PBD::Signal0<void> BeginUndoRedo;
+       PBD::Signal0<void> EndUndoRedo;
        
   private:
        bool _clearing;
-       int32_t _depth;
+       uint32_t _depth;
        std::list<UndoTransaction*> UndoList;
        std::list<UndoTransaction*> RedoList;