X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fpbd%2Fundo.h;h=11ff2bf321b806106001ce8a9f27d768b890c86a;hb=a459f96e38f569503e6d983808210d9d43a396ec;hp=49ff19ccceca24bfd794e0ad27fd199cf34a0be8;hpb=514daa01ece4a69c8b7b98beaa58b445a440bf90;p=ardour.git

diff --git a/libs/pbd/pbd/undo.h b/libs/pbd/pbd/undo.h
index 49ff19ccce..11ff2bf321 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__
@@ -27,10 +26,8 @@
 #include <sigc++/slot.h>
 #include <sigc++/bind.h>
 #include <sys/time.h>
-#include <pbd/command.h>
 
-using std::string;
-using std::list;
+#include "pbd/command.h"
 
 typedef sigc::slot<void> UndoAction;
 
@@ -40,21 +37,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,34 +61,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 ();
 
+	/* 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*);
 };