smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 00:34:59 +01:00
Code Issues Projects Releases Wiki Activity

manual fixups for recent rebase conflicts left in the wrong state (GUI edition)

Browse source
This commit is contained in:
Paul Davis 2021-01-14 12:55:51 -07:00
parent 04688292d6
commit 125c20e148
4 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/editor.cc
View file

@ -2600,7 +2600,7 @@ void
Editor::set_snapped_cursor_position (timepos_t const & pos)
{
if (_edit_point == EditAtMouse) {
snapped_cursor->set_position (pos.samples());
_snapped_cursor->set_position (pos.samples());
}
}
@ -4849,7 +4849,7 @@ Editor::get_preferred_edit_position (EditIgnoreOption ignore, bool from_context_
case EditAtPlayhead:
if (_dragging_playhead) {
/* NOTE: since the user is dragging with the mouse, this operation will implicitly be Snapped */
where = timepos_t (playhead_cursor->current_sample());
where = timepos_t (_playhead_cursor->current_sample());
} else {
where = timepos_t (_session->audible_sample());
}
@ -5957,8 +5957,8 @@ Editor::super_rapid_screen_update ()
if (!selection->markers.empty()) {
timepos_t ms (selection->markers.front()->position());
snap_to (ms); // should use snap_to_with_modifier?
snapped_cursor->set_position (ms.samples());
snapped_cursor->show ();
_snapped_cursor->set_position (ms.samples());
_snapped_cursor->show ();
}
} else if (_edit_point == EditAtMouse && mouse_sample (where.sample, ignored)) {
/* cursor is in the editing canvas. show it. */