summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-06-05 07:10:06 +1000
committernick_m <mainsbridge@gmail.com>2016-06-05 07:10:06 +1000
commitb4a020cdf57107d44fabd983b6c4074da2eb519e (patch)
treeaef188a5395b058ef373134b89320bebca03b2f4 /libs/ardour
parente627a9681af84680d3d5c174128469a0abb255c9 (diff)
Fix ignored note_type in TempoMap::frames_per_beat_at().
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/tempo.cc2
1 files changed, 1 insertions, 1 deletions
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);