diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-11-06 05:14:20 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-11-11 03:37:08 +1100 |
| commit | 33e95a15778e7fe87c204b0c4f2db039f857b523 (patch) | |
| tree | 90678ea8fdf2a8a9532d808fd2efbf5775e5290e /gtk2_ardour/tempo_lines.cc | |
| parent | e52f90357e79dac10da2bee0e27d51e8b07d5b83 (diff) | |
rename Tempo _beats_per_minute to _note_types_per_minute, provide pulse helpers.
- adds quarter_notes_per_minute(), note_divisions_per_minute (double)
pulses_per_minute() and frames_per_quarter_note()
- this should be a no-op except for the use of tempo by
the vst callback which definitely uses quarter notes per minute.
- the XML node for TempoSection named 'beats-per-minute'
has been renamed.
Diffstat (limited to 'gtk2_ardour/tempo_lines.cc')
| -rw-r--r-- | gtk2_ardour/tempo_lines.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc index c9160fdf9a..7a780c424e 100644 --- a/gtk2_ardour/tempo_lines.cc +++ b/gtk2_ardour/tempo_lines.cc @@ -77,11 +77,11 @@ TempoLines::draw_ticks (std::vector<ARDOUR::TempoMap::BBTPoint>& grid, if (grid.begin()->c != 0.0) { const double beat_divisions = (l / ((double) divisions)) * (grid.begin()->tempo.note_type() / grid.begin()->meter.note_divisor()); const double time_at_division = log (((grid.begin()->c * (beat_divisions)) / - grid.begin()->tempo.beats_per_minute()) + 1) / grid.begin()->c; + grid.begin()->tempo.note_types_per_minute()) + 1) / grid.begin()->c; f = grid.begin()->frame + (framecnt_t) floor ((time_at_division * 60.0 * frame_rate) + 0.5); } else { - const double fpb = grid.begin()->tempo.frames_per_beat (frame_rate) + const double fpb = grid.begin()->tempo.frames_per_note_type (frame_rate) * (grid.begin()->tempo.note_type() / grid.begin()->meter.note_divisor()); f = grid.begin()->frame + (l * (fpb / (double) divisions)); |