ardour/livetrax
13
0
Fork 0
Code

Fix the case of jump-to-next-Subdivision

Browse Source
This commit is contained in:
Ben Loftis 2016-12-19 17:20:56 -06:00
parent 22bc091c37
commit 6941d0b74d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/ardour/tempo.cc
View File

@ -3808,9 +3808,14 @@ TempoMap::round_to_quarter_note_subdivision (framepos_t fr, int sub_num, RoundMo
ticks += ticks_one_subdivisions_worth - mod; ticks += ticks_one_subdivisions_worth - mod;
} }
if (ticks >= BBT_Time::ticks_per_beat) { //NOTE: this code intentionally limits the rounding so we don't advance to the next beat.
ticks -= BBT_Time::ticks_per_beat; // For the purposes of "jump-to-next-subdivision", we DO want to advance to the next beat.
} // And since the "prev" direction DOES move beats, I assume this code is unintended.
// But I'm keeping it around, until we determine there are no terrible consequences.
// if (ticks >= BBT_Time::ticks_per_beat) {
// ticks -= BBT_Time::ticks_per_beat;
// }
} else if (dir < 0) { } else if (dir < 0) {
/* round to previous (or same iff dir == RoundDownMaybe) */ /* round to previous (or same iff dir == RoundDownMaybe) */