Merged with trunk R776

git-svn-id: svn://localhost/ardour2/branches/midi@777 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 6 insertions, 1 deletions

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 05a134157e..3488c756ac 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -142,6 +142,8 @@ class Editor : public PublicEditor
 	XMLNode& get_state ();
 	int set_state (const XMLNode& );
 
+        PBD::ID id() { return _id; }
+
 	void set_mouse_mode (Editing::MouseMode, bool force=true);
 	void step_mouse_mode (bool next);
 	Editing::MouseMode current_mouse_mode () { return mouse_mode; }
@@ -346,6 +348,8 @@ class Editor : public PublicEditor
 	ARDOUR::AudioEngine& engine;
 	bool                 constructed;
 
+        PBD::ID _id;
+
 	PlaylistSelector* _playlist_selector;
 
 	void          set_frames_per_unit (double);
@@ -1595,13 +1599,14 @@ class Editor : public PublicEditor
 
 	UndoAction get_memento() const;
 
+        XMLNode *before; /* used in *_reversible_command */
 	void begin_reversible_command (string cmd_name);
 	void commit_reversible_command ();
 
 	/* visual history */
 
 	UndoHistory visual_history;
-	UndoCommand current_visual_command;
+	UndoTransaction current_visual_command;
 
 	void begin_reversible_visual_command (const string & cmd_name);
 	void commit_reversible_visual_command ();