From 80d1631aa31bedebb0b22956db1b585df8649578 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Thu, 3 Jul 2014 12:49:59 -0500 Subject: [PATCH] if a Range end is trimmed, in follow-edits mode, locate to the range end so it can be auditioned. (same as trimming a region end) --- gtk2_ardour/editor_drag.cc | 5 ++++- gtk2_ardour/editor_selection.cc | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 0cc6ad45f9..f852981487 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -4350,7 +4350,10 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred) s->request_play_range (&_editor->selection->time, true); } else { if (Config->get_follow_edits() && !s->transport_rolling()) { - s->request_locate (_editor->get_selection().time.start()); + if (_operation == SelectionEndTrim) + _editor->maybe_locate_with_edit_preroll( _editor->get_selection().time.end_frame()); + else + s->request_locate (_editor->get_selection().time.start()); } } } diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index 229d658a5a..fd9d68fe93 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -1013,10 +1013,6 @@ Editor::time_selection_changed () } else { ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, true); } - - if (_session && Config->get_follow_edits() && !_session->transport_rolling() && !selection->time.empty()) { - _session->request_locate (selection->time.start()); - } } /** Set all region actions to have a given sensitivity */