ardour/livetrax
13
0
Fork 0
Code

libtemporal: improve implementation/accuracy of Meter::round_to_bar()

Browse Source
This commit is contained in:
Paul Davis 2021-01-04 21:55:14 -07:00
parent e393c5efcf
commit 68f6bff258
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/temporal/tempo.cc
View File

@ -343,12 +343,14 @@ Meter::bbt_subtract (Temporal::BBT_Time const & bbt, Temporal::BBT_Offset const
Temporal::BBT_Time
Meter::round_to_bar (Temporal::BBT_Time const & bbt) const
{
Temporal::BBT_Time b = bbt.round_to_beat ();
if (b.beats > _divisions_per_bar/2) {
b.bars++;
Beats b (bbt.beats, bbt.ticks);
Beats half (Beats::ticks (Beats::PPQN + ((_divisions_per_bar * Beats::PPQN / 2))));
if (b >= half) {
return BBT_Time (bbt.bars+1, 1, 0);
}
b.beats = 1;
return b;
return BBT_Time (bbt.bars, 1, 0);
}
Temporal::BBT_Time