projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 5bfccf5a062fdf9bdfac4e625eb0ba9b6e001280..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 <sigc++/slot.h>
#include <sigc++/bind.h>
#include <sys/time.h>
-#include <pbd/command.h>
+
+#include "pbd/command.h"
typedef sigc::slot<void> UndoAction;
typedef sigc::slot<void> UndoAction;
@@
-65,9
+66,11
@@
class UndoTransaction : public Command
bool _clearing;
friend void command_death (UndoTransaction*, 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();
{
public:
UndoHistory();
@@
-80,20
+83,33
@@
class UndoHistory : public sigc::trackable
unsigned long undo_depth() const { return UndoList.size(); }
unsigned long redo_depth() const { return RedoList.size(); }
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 ();
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);
+
+ PBD::Signal0<void> Changed;
+ PBD::Signal0<void> BeginUndoRedo;
+ PBD::Signal0<void> EndUndoRedo;
+
private:
bool _clearing;
private:
bool _clearing;
+ uint32_t _depth;
std::list<UndoTransaction*> UndoList;
std::list<UndoTransaction*> RedoList;
std::list<UndoTransaction*> UndoList;
std::list<UndoTransaction*> RedoList;