ardour/livetrax
13
0
Fork 0
Code

Revert 894cdb6f5c.

Browse Source 
- once again we snap to BBT beats when snapping to 'beat'.
This commit is contained in:
nick_m 2016-09-01 02:43:29 +10:00
parent 894cdb6f5c
commit d05bfa7206
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/tempo.cc
View File

@ -3445,14 +3445,12 @@ 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_quarter_note_locked (_metrics, floor (qn_at_frame));
return frame_at_beat_locked (_metrics, floor (beat_at_framepos));
} else if (dir > 0) {
return frame_at_quarter_note_locked (_metrics, ceil (qn_at_frame));
return frame_at_beat_locked (_metrics, ceil (beat_at_framepos));
} else {
return frame_at_quarter_note_locked (_metrics, floor (qn_at_frame + 0.5));
return frame_at_beat_locked (_metrics, floor (beat_at_framepos + 0.5));
}
break;
}