*** NEW CODING POLICY ***

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

diff --git a/libs/pbd/pbd/undo.h b/libs/pbd/pbd/undo.h
index ea9a6d0e8bf7a81044a4b3df2a7ab40baa1675b2..0e48bea96238c7b414572d50815e818121c08aad 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"
+#include "pbd/shiva.h"
 
 typedef sigc::slot<void> UndoAction;
 
@@ -36,7 +37,6 @@ class UndoTransaction : public Command
        UndoTransaction ();
        UndoTransaction (const UndoTransaction&);
        UndoTransaction& operator= (const UndoTransaction&);
-       ~UndoTransaction ();
 
        void clear ();
        bool empty() const;
@@ -50,11 +50,6 @@ class UndoTransaction : public Command
        void redo();
 
        XMLNode &get_state();
-       
-       void set_name (const std::string& str) {
-               _name = str;
-       }
-       const std::string& name() const { return _name; }
 
        void set_timestamp (struct timeval &t) {
                _timestamp = t;
@@ -66,11 +61,17 @@ class UndoTransaction : public Command
 
   private:
        std::list<Command*>    actions;
+       std::list<PBD::ProxyShiva<Command,UndoTransaction>*> shivas;
        struct timeval        _timestamp;
-       std::string           _name;
        bool                  _clearing;
 
        friend void command_death (UndoTransaction*, Command *);
+       
+       friend class UndoHistory;
+
+       ~UndoTransaction ();
+       void about_to_explicitly_delete ();
+       
 };
 
 class UndoHistory : public sigc::trackable
@@ -86,20 +87,31 @@ class UndoHistory : public sigc::trackable
        unsigned long undo_depth() const { return UndoList.size(); }
        unsigned long redo_depth() const { return RedoList.size(); }
        
-       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()); }
+       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(uint32_t depth = 0);
-       void save_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.
+       */
 
-       sigc::signal<void> Changed;
+        XMLNode &get_state(int32_t depth = 0);
+        void save_state();
+
+       void set_depth (uint32_t);
 
+       sigc::signal<void> Changed;
+       
   private:
        bool _clearing;
+       uint32_t _depth;
        std::list<UndoTransaction*> UndoList;
        std::list<UndoTransaction*> RedoList;