From 62c8963170b13548eb69d1e5026e2e887e39e03e Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Mon, 26 Nov 2012 23:07:21 +0000 Subject: [PATCH] region selections and moves should have optional preroll when playhead follows edits git-svn-id: svn://localhost/ardour2/branches/3.0@13552 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_drag.cc | 4 +--- gtk2_ardour/editor_selection.cc | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index c0155a8b62..bac7c675c3 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -899,9 +899,7 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred) } - if (_editor->session() && Config->get_always_play_range()) { - _editor->session()->request_locate (_editor->get_selection().regions.start()); - } + _editor->maybe_locate_with_edit_preroll (_editor->get_selection().regions.start()); } void diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index d299b2fd9e..3f88ddbce5 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -1296,8 +1296,8 @@ Editor::region_selection_changed () sensitize_all_region_actions (true); } - if (_session && Config->get_always_play_range() && !_session->transport_rolling() && !selection->regions.empty()) { - _session->request_locate (selection->regions.start()); + if (_session && !_session->transport_rolling() && !selection->regions.empty()) { + maybe_locate_with_edit_preroll (selection->regions.start()); } }