ardour/livetrax
13
0
Fork 0
Code

remove unnecessary 2nd argument from Session::request_locate() calls (default value is identical)

Browse Source
This commit is contained in:
Paul Davis 2021-04-28 19:55:37 -06:00
parent c7c5379fac
commit ac53a9bbf8
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.cc
View File

@ -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.

2
gtk2_ardour/audio_clock.cc
View File

@ -2181,7 +2181,7 @@ AudioClock::locate ()
return;
}
_session->request_locate (current_time(), RollIfAppropriate);
_session->request_locate (current_time());
}
void

2
gtk2_ardour/editor.cc
View File

@ -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;

2
gtk2_ardour/editor_drag.cc
View File

@ -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) {

2
gtk2_ardour/editor_markers.cc
View File

@ -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;

12
gtk2_ardour/editor_ops.cc
View File

@ -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 */

2
gtk2_ardour/editor_summary.cc
View File

@ -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;
}
}

6
gtk2_ardour/mini_timeline.cc
View File

@ -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;
}