From 9af9e17adc96f7c27ce0e1651d6949393e787636 Mon Sep 17 00:00:00 2001 From: nick_m Date: Mon, 15 Dec 2014 00:13:38 +1100 Subject: Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug. --- gtk2_ardour/editor_markers.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gtk2_ardour/editor_markers.cc') diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 6d07ecc357..d982de3a32 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -654,12 +654,12 @@ Editor::mouse_add_new_marker (framepos_t where, bool is_cd, bool is_xrun) return; } Location *location = new Location (*_session, where, where, markername, (Location::Flags) flags); - _session->begin_reversible_command (_("add marker")); + begin_reversible_command (_("add marker")); + XMLNode &before = _session->locations()->get_state(); _session->locations()->add (location, true); XMLNode &after = _session->locations()->get_state(); _session->add_command (new MementoCommand(*(_session->locations()), &before, &after)); - _session->commit_reversible_command (); /* find the marker we just added */ @@ -668,6 +668,8 @@ Editor::mouse_add_new_marker (framepos_t where, bool is_cd, bool is_xrun) /* make it the selected marker */ selection->set (lam->start); } + + commit_reversible_command (); } } @@ -721,12 +723,12 @@ Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*) gint Editor::really_remove_marker (Location* loc) { - _session->begin_reversible_command (_("remove marker")); + begin_reversible_command (_("remove marker")); XMLNode &before = _session->locations()->get_state(); _session->locations()->remove (loc); XMLNode &after = _session->locations()->get_state(); _session->add_command (new MementoCommand(*(_session->locations()), &before, &after)); - _session->commit_reversible_command (); + commit_reversible_command (); return FALSE; } -- cgit v1.2.3