diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index b05359abc6..770da5425b 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1684,7 +1684,7 @@ ARDOUR_UI::transport_goto_wallclock () samples += tmnow.tm_min * (60 * sample_rate); samples += tmnow.tm_sec * sample_rate; - _session->request_locate (samples, RollIfAppropriate); + _session->request_locate (samples); /* force displayed area in editor to start no matter what "follow playhead" setting is. diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index b232e7a32e..a40ed95d2c 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -2181,7 +2181,7 @@ AudioClock::locate () return; } - _session->request_locate (current_time(), RollIfAppropriate); + _session->request_locate (current_time()); } void diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index c6087bc746..9d06345c03 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -1100,7 +1100,7 @@ Editor::control_scroll (float fraction) bool Editor::deferred_control_scroll (samplepos_t /*target*/) { - _session->request_locate (*_control_scroll_target, RollIfAppropriate); + _session->request_locate (*_control_scroll_target); /* reset for next stream */ _control_scroll_target = boost::none; _dragging_playhead = false; diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index f6001971b9..d774008aba 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -6054,7 +6054,7 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred) /* didn't drag, so just locate */ - _editor->session()->request_locate (grab_sample(), RollIfAppropriate); + _editor->session()->request_locate (grab_sample()); } else if (_operation == CreateCDMarker) { diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index ab594f7f70..29864da13d 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -1771,7 +1771,7 @@ Editor::goto_nth_marker (int n) for (Locations::LocationList::iterator i = ordered.begin(); n >= 0 && i != ordered.end(); ++i) { if ((*i)->is_mark() && !(*i)->is_hidden() && !(*i)->is_session_range()) { if (n == 0) { - _session->request_locate ((*i)->start(), RollIfAppropriate); + _session->request_locate ((*i)->start()); break; } --n; diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 9b580ede31..6f7a33ab77 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -1360,7 +1360,7 @@ Editor::cursor_align (bool playhead_to_edit) return; } - _session->request_locate (selection->markers.front()->position(), RollIfAppropriate); + _session->request_locate (selection->markers.front()->position()); } else { const int32_t divisions = get_grid_music_divisions (0); @@ -2452,7 +2452,7 @@ Editor::jump_forward_to_mark () return; } - _session->request_locate (pos, RollIfAppropriate); + _session->request_locate (pos); } void @@ -2476,7 +2476,7 @@ Editor::jump_backward_to_mark () return; } - _session->request_locate (pos, RollIfAppropriate); + _session->request_locate (pos); } void @@ -6632,7 +6632,7 @@ void Editor::set_playhead_cursor () { if (entered_marker) { - _session->request_locate (entered_marker->position(), RollIfAppropriate); + _session->request_locate (entered_marker->position()); } else { MusicSample where (0, 0); bool ignored; @@ -6644,7 +6644,7 @@ Editor::set_playhead_cursor () snap_to (where); if (_session) { - _session->request_locate (where.sample, RollIfAppropriate); + _session->request_locate (where.sample); } } @@ -7642,7 +7642,7 @@ Editor::playhead_backward_to_grid () } } - _session->request_locate (pos.sample, RollIfAppropriate); + _session->request_locate (pos.sample); } /* keep PH visible in window */ diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc index d472d7eca0..a262eae6b7 100644 --- a/gtk2_ardour/editor_summary.cc +++ b/gtk2_ardour/editor_summary.cc @@ -437,7 +437,7 @@ EditorSummary::on_key_press_event (GdkEventKey* key) if (key->keyval == set_playhead_accel.accel_key && (int) key->state == set_playhead_accel.accel_mods) { if (_session) { get_pointer (x, y); - _session->request_locate (_start + (samplepos_t) x / _x_scale, RollIfAppropriate); + _session->request_locate (_start + (samplepos_t) x / _x_scale); return true; } } diff --git a/gtk2_ardour/mini_timeline.cc b/gtk2_ardour/mini_timeline.cc index 5c5df8dd20..88fbe89836 100644 --- a/gtk2_ardour/mini_timeline.cc +++ b/gtk2_ardour/mini_timeline.cc @@ -718,7 +718,7 @@ MiniTimeline::on_button_release_event (GdkEventButton *ev) if (ev->y <= PADDING + _marker_height) { for (JumpList::const_iterator i = _jumplist.begin (); i != _jumplist.end(); ++i) { if (i->left <= ev->x && ev->x <= i->right) { - _session->request_locate (i->to, RollIfAppropriate); + _session->request_locate (i->to); return true; } } @@ -726,7 +726,7 @@ MiniTimeline::on_button_release_event (GdkEventButton *ev) if (ev->button == 1) { samplepos_t when = _last_update_sample + (ev->x - get_width() * .5) / _px_per_sample; - _session->request_locate (std::max ((samplepos_t)0, when), RollIfAppropriate); + _session->request_locate (std::max ((samplepos_t)0, when)); } return true; @@ -808,6 +808,6 @@ MiniTimeline::on_scroll_event (GdkEventScroll *ev) return true; break; } - _session->request_locate (std::max ((samplepos_t)0, when), RollIfAppropriate); + _session->request_locate (std::max ((samplepos_t)0, when)); return true; }