diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2016-12-19 17:20:56 -0600 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2016-12-19 17:25:59 -0600 |
| commit | 6941d0b74d4588e077a8761bd7cf6275b1c3460a (patch) | |
| tree | 6a77ce13a13a14635115a900fa5bb67cffdd0c1b | |
| parent | 22bc091c3766587cd9e909c00c16e201630ac278 (diff) | |
Fix the case of jump-to-next-Subdivision
| -rw-r--r-- | libs/ardour/tempo.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 995eb56798..4e6a853ec5 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -3808,9 +3808,14 @@ TempoMap::round_to_quarter_note_subdivision (framepos_t fr, int sub_num, RoundMo ticks += ticks_one_subdivisions_worth - mod; } - if (ticks >= BBT_Time::ticks_per_beat) { - ticks -= BBT_Time::ticks_per_beat; - } +//NOTE: this code intentionally limits the rounding so we don't advance to the next 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) { /* round to previous (or same iff dir == RoundDownMaybe) */ |