ardour/livetrax
13
0
Fork 0
Code

ensure tempo lines use correct tempo type (constant/ramped)

Browse Source
This commit is contained in:
nick_m 2017-01-06 01:59:47 +11:00
parent 05c2e4ef9b
commit a196ce68fd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/tempo.cc
View File

@ -3957,7 +3957,9 @@ TempoMap::get_grid (vector<TempoMap::BBTPoint>& points,
const TempoSection tempo = tempo_section_at_minute_locked (_metrics, minute_at_frame (pos)); const TempoSection tempo = tempo_section_at_minute_locked (_metrics, minute_at_frame (pos));
const MeterSection meter = meter_section_at_minute_locked (_metrics, minute_at_frame (pos)); const MeterSection meter = meter_section_at_minute_locked (_metrics, minute_at_frame (pos));
const BBT_Time bbt = bbt_at_beat_locked (_metrics, cnt); const BBT_Time bbt = bbt_at_beat_locked (_metrics, cnt);
points.push_back (BBTPoint (meter, tempo_at_minute_locked (_metrics, minute_at_frame (pos)), pos, bbt.bars, bbt.beats, tempo.c_func())); const double c = (tempo.type() == TempoSection::Constant) ? 0.0 : tempo.c_func();
points.push_back (BBTPoint (meter, tempo_at_minute_locked (_metrics, minute_at_frame (pos)), pos, bbt.bars, bbt.beats, c));
++cnt; ++cnt;
} }
} else { } else {