From b4a020cdf57107d44fabd983b6c4074da2eb519e Mon Sep 17 00:00:00 2001 From: nick_m Date: Sun, 5 Jun 2016 07:10:06 +1000 Subject: [PATCH] Fix ignored note_type in TempoMap::frames_per_beat_at(). --- libs/ardour/tempo.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index b38d73c001..d46656c4c7 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -3032,7 +3032,7 @@ TempoMap::frames_per_beat_at (const framepos_t& frame, const framecnt_t& sr) con } if (ts_after) { - return (60.0 * _frame_rate) / (ts_at->tempo_at_frame (frame, _frame_rate)); + return (60.0 * _frame_rate) / (ts_at->tempo_at_frame (frame, _frame_rate) * ts_at->note_type()); } /* must be treated as constant tempo */ return ts_at->frames_per_beat (_frame_rate);