Ignore playhead when finding delta from edit position for main clocks
Pass 'ignore_playhead == true' to Editor::get_preferred_edit_position() when calculating offset of the primary and secondary main clocks if 'delta to edit cursor' is selected, so that if the edit point is playhead, the selected marker (if any) or mouse position will be used as the delta origin instead.
This commit is contained in:
parent
1973243a98
commit
24e8e865a6
|
@ -2269,7 +2269,7 @@ ARDOUR_UI::update_clocks ()
|
|||
if (!_session) return;
|
||||
|
||||
if (editor && !editor->dragging_playhead()) {
|
||||
Clock (_session->audible_frame(), false, editor->get_preferred_edit_position()); /* EMIT_SIGNAL */
|
||||
Clock (_session->audible_frame(), false, editor->get_preferred_edit_position (true)); /* EMIT_SIGNAL */
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -4218,13 +4218,13 @@ void
|
|||
ARDOUR_UI::update_transport_clocks (framepos_t pos)
|
||||
{
|
||||
if (ui_config->get_primary_clock_delta_edit_cursor()) {
|
||||
primary_clock->set (pos, false, editor->get_preferred_edit_position());
|
||||
primary_clock->set (pos, false, editor->get_preferred_edit_position (true));
|
||||
} else {
|
||||
primary_clock->set (pos);
|
||||
}
|
||||
|
||||
if (ui_config->get_secondary_clock_delta_edit_cursor()) {
|
||||
secondary_clock->set (pos, false, editor->get_preferred_edit_position());
|
||||
secondary_clock->set (pos, false, editor->get_preferred_edit_position (true));
|
||||
} else {
|
||||
secondary_clock->set (pos);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user