diff options
author | Sampo Savolainen <v2@iki.fi> | 2006-03-21 18:40:17 +0000 |
---|---|---|
committer | Sampo Savolainen <v2@iki.fi> | 2006-03-21 18:40:17 +0000 |
commit | d63c0fa328429ff0d7917fe3f4458c97063ba450 (patch) | |
tree | 96518551baaaaf031eeffd3d409d3d8ce17e11ee /gtk2_ardour | |
parent | ff5f86778484538331a6c538cc0b4eff4cbc153d (diff) |
Various marker undo fixes.
git-svn-id: svn://localhost/trunk/ardour2@413 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/editor_markers.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/editor_mouse.cc | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index d933357685..e611b72d3f 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -810,7 +810,13 @@ Editor::marker_menu_rename () return; } + begin_reversible_command ( _("rename marker") ); + session->add_undo( session->locations()->get_memento() ); + loc->set_name (entry.get_text()); + + session->add_redo_no_execute( session->locations()->get_memento() ); + commit_reversible_command (); } gint diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 8c0b5229bf..6b38b904e1 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -2112,10 +2112,20 @@ Editor::marker_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event Marker* marker = (Marker *) drag_info.data; bool is_start; + + + + begin_reversible_command ( _("move marker") ); + session->add_undo( session->locations()->get_memento() ); + Location * location = find_location_from_marker (marker, is_start); + if (location) { location->set (drag_info.copied_location->start(), drag_info.copied_location->end()); } + + session->add_redo_no_execute( session->locations()->get_memento() ); + commit_reversible_command (); marker_drag_line->hide(); range_marker_drag_rect->hide(); |