From 894cdb6f5c20641962ec86542b084fa7e5ccdf13 Mon Sep 17 00:00:00 2001 From: nick_m Date: Thu, 1 Sep 2016 01:35:53 +1000 Subject: [PATCH] Snap to beat snaps to quarter note. --- libs/ardour/tempo.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 3a938c54d4..a8d5c35a68 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -3445,12 +3445,14 @@ TempoMap::round_to_type (framepos_t frame, RoundMode dir, BBTPointType type) break; case Beat: + const double qn_at_frame = max (0.0, quarter_note_at_frame_locked (_metrics, frame)); + if (dir < 0) { - return frame_at_beat_locked (_metrics, floor (beat_at_framepos)); + return frame_at_quarter_note_locked (_metrics, floor (qn_at_frame)); } else if (dir > 0) { - return frame_at_beat_locked (_metrics, ceil (beat_at_framepos)); + return frame_at_quarter_note_locked (_metrics, ceil (qn_at_frame)); } else { - return frame_at_beat_locked (_metrics, floor (beat_at_framepos + 0.5)); + return frame_at_quarter_note_locked (_metrics, floor (qn_at_frame + 0.5)); } break; }