diff options
author | nick_m <mainsbridge@gmail.com> | 2014-12-15 00:13:38 +1100 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-18 11:03:10 -0500 |
commit | 9af9e17adc96f7c27ce0e1651d6949393e787636 (patch) | |
tree | 395fb4ddffd3a66ba0e8021bd7ec1de137c315d2 /gtk2_ardour/location_ui.cc | |
parent | 2c8a769aaef7465f170edf37982733fd19d89c0e (diff) |
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.
Diffstat (limited to 'gtk2_ardour/location_ui.cc')
-rw-r--r-- | gtk2_ardour/location_ui.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 689706ba01..3c4a28097e 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -33,6 +33,7 @@ #include "location_ui.h" #include "prompter.h" #include "utils.h" +#include "public_editor.h" #include "i18n.h" @@ -853,12 +854,12 @@ LocationUI::do_location_remove (ARDOUR::Location *loc) return FALSE; } - _session->begin_reversible_command (_("remove marker")); + PublicEditor::instance().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<Locations>(*(_session->locations()), &before, &after)); - _session->commit_reversible_command (); + PublicEditor::instance().commit_reversible_command (); return FALSE; } @@ -1017,12 +1018,12 @@ LocationUI::add_new_location() if (Config->get_name_new_markers()) { newest_location = location; } - _session->begin_reversible_command (_("add marker")); + PublicEditor::instance().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<Locations>(*(_session->locations()), &before, &after)); - _session->commit_reversible_command (); + PublicEditor::instance().commit_reversible_command (); } } @@ -1036,12 +1037,12 @@ LocationUI::add_new_range() framepos_t where = _session->audible_frame(); _session->locations()->next_available_name(rangename,"unnamed"); Location *location = new Location (*_session, where, where, rangename, Location::IsRangeMarker); - _session->begin_reversible_command (_("add range marker")); + PublicEditor::instance().begin_reversible_command (_("add range marker")); XMLNode &before = _session->locations()->get_state(); _session->locations()->add (location, true); XMLNode &after = _session->locations()->get_state(); _session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after)); - _session->commit_reversible_command (); + PublicEditor::instance().commit_reversible_command (); } } |