diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-05-25 11:31:41 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:17 +1000 |
| commit | 48fa2e7582212dc66cb3ad843cda4d0eb4892bfa (patch) | |
| tree | 9f1fc24c0dc90cf1d446f92f8e475d2376adf31c /libs/ardour/tempo.cc | |
| parent | de5f8dd3d35b429a3d7135bf8b48703a1aea2a24 (diff) | |
Tempo ramps - fix erroneous paste.
Diffstat (limited to 'libs/ardour/tempo.cc')
| -rw-r--r-- | libs/ardour/tempo.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index e823f8f26c..c7bc0938be 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -1704,7 +1704,7 @@ TempoMap::pulse_at_bbt_locked (const Metrics& metrics, const Timecode::BBT_Time& const double remaining_bars = bbt.bars - prev_m->bbt().bars; const double remaining_pulses = remaining_bars * prev_m->divisions_per_bar() / prev_m->note_divisor(); - const double ret = remaining_pulses + prev_m->pulse(); + const double ret = remaining_pulses + prev_m->pulse() + (((bbt.beats - 1) + (bbt.ticks / BBT_Time::ticks_per_beat)) / prev_m->note_divisor()); return ret; } |