summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_drag.cc
diff options
context:
space:
mode:
authorBen Loftis <ben@harrisonconsoles.com>2016-12-19 12:22:39 -0600
committerBen Loftis <ben@harrisonconsoles.com>2016-12-19 13:14:44 -0600
commit628c99d5555b30992d41e8b5b5ffef44ad7f31d7 (patch)
tree86336ef01b624ef0e228bef44b3dd13251a1c79c /gtk2_ardour/editor_drag.cc
parent267dd5edd9b3f6296778c7f108b437033bcf2b39 (diff)
Follow Edits => Follow Range
* "Follow Edits" button had several behaviors that confused users. * "Follow Range" only has 2 behaviors: ** Click anywhere in Range mode (or Smart mode) to locate the playhead. ** When you select a Range, "Play" will play the selected range.
Diffstat (limited to 'gtk2_ardour/editor_drag.cc')
-rw-r--r--gtk2_ardour/editor_drag.cc19
1 files changed, 1 insertions, 18 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 24f91bf1c4..966cd293f5 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -1421,8 +1421,6 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred)
);
}
-
- _editor->maybe_locate_with_edit_preroll (_editor->get_selection().regions.start());
}
RouteTimeAxisView*
@@ -3121,18 +3119,6 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred)
}
}
- if (!_views.empty()) {
- if (_operation == StartTrim) {
- _editor->maybe_locate_with_edit_preroll(
- _views.begin()->view->region()->position());
- }
- if (_operation == EndTrim) {
- _editor->maybe_locate_with_edit_preroll(
- _views.begin()->view->region()->position() +
- _views.begin()->view->region()->length());
- }
- }
-
if (!_editor->selection->selected (_primary)) {
_primary->thaw_after_trim ();
} else {
@@ -5323,10 +5309,7 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred)
s->request_play_range (&_editor->selection->time, true);
} else if (!s->config.get_external_sync()) {
if (UIConfiguration::instance().get_follow_edits() && !s->transport_rolling()) {
- if (_operation == SelectionEndTrim)
- _editor->maybe_locate_with_edit_preroll( _editor->get_selection().time.end_frame());
- else
- s->request_locate (_editor->get_selection().time.start());
+ s->request_locate (_editor->get_selection().time.start());
}
}