Merge branch 'master' into cairocanvas

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

diff --git a/libs/pbd/pbd/undo.h b/libs/pbd/pbd/undo.h
index 9539d8b41dc734fd8ac88bcc33c1186d177de734..11ff2bf321b806106001ce8a9f27d768b890c86a 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
@@ -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;
 
@@ -45,16 +46,11 @@ class UndoTransaction : public Command
        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 std::string& str) {
-               _name = str;
-       }
-       const std::string& name() const { return _name; }
 
        void set_timestamp (struct timeval &t) {
                _timestamp = t;
@@ -67,13 +63,14 @@ class UndoTransaction : public Command
   private:
        std::list<Command*>    actions;
        struct timeval        _timestamp;
-       std::string           _name;
        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();
@@ -86,20 +83,33 @@ 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);
+       /* 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();
 
-       sigc::signal<void> Changed;
+       void set_depth (uint32_t);
 
+       PBD::Signal0<void> Changed;
+       PBD::Signal0<void> BeginUndoRedo;
+       PBD::Signal0<void> EndUndoRedo;
+       
   private:
        bool _clearing;
+       uint32_t _depth;
        std::list<UndoTransaction*> UndoList;
        std::list<UndoTransaction*> RedoList;