X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fpbd%2Fundo.h;h=e9582a1b53dd40cdc9308bbf7097fa7c2e0f69da;hb=350ed31655b00f3043e5d723606cdd50099fa91b;hp=eb46750e4ffb160c4f0aa224f8d7865377d33934;hpb=2bf3ed423f7aecdaabf5fbb078d9e2f20d26880c;p=ardour.git

diff --git a/libs/pbd/pbd/undo.h b/libs/pbd/pbd/undo.h
index eb46750e4f..e9582a1b53 100644
--- 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,8 +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
+
+#include "pbd/command.h"
 
 typedef sigc::slot<void> UndoAction;
 
@@ -46,16 +50,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;
@@ -68,13 +67,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();
@@ -87,20 +87,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();
+	/* 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;