diff options
| author | Ben Loftis <ben@glw.com> | 2012-11-20 19:43:43 +0000 |
|---|---|---|
| committer | Ben Loftis <ben@glw.com> | 2012-11-20 19:43:43 +0000 |
| commit | beb3ec2d7a440308bce6e2db793d78f528c9fa85 (patch) | |
| tree | e673c98d6d5011f78eebd2e4b18975e95773ec6c /gtk2_ardour/editor_drag.cc | |
| parent | 38c10a4d2367111f3b9c7ac2223a8b633bfeb147 (diff) | |
Always Play Range is now Follow Edits, and is based on Mixbus implementation. Added menu item. Follow Edits button replaces Auto Play; removed the connector between play and play-range. Some Smart Mode changes came along for the ride but will be cleaned up shortly
git-svn-id: svn://localhost/ardour2/branches/3.0@13537 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_drag.cc')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index d06191d368..07971e4d22 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -1792,6 +1792,13 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred) } } + 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 { @@ -3641,11 +3648,6 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred) s->request_stop (false, false); } - if (Config->get_always_play_range()) { - if (_editor->doing_range_stuff()) { - s->request_locate (_editor->get_selection().time.start()); - } - } } _editor->stop_canvas_autoscroll (); |