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/editor_markers.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/editor_markers.cc')
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 351ba31126..6751f6424f 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -1404,7 +1404,7 @@ Editor::toggle_marker_lock_style () } else if (tm) { TempoSection* tsp = &tm->tempo(); - const Tempo tempo (tsp->beats_per_minute()); + const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type()); const double pulse = tsp->pulse(); const framepos_t frame = tsp->frame(); const TempoSection::Type type = tsp->type(); @@ -1431,7 +1431,7 @@ Editor::toggle_tempo_type () if (tm) { TempoSection* tsp = &tm->tempo(); - const Tempo tempo (tsp->beats_per_minute(), tsp->note_type()); + const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type()); const double pulse = tsp->pulse(); const framepos_t frame = tsp->frame(); const TempoSection::Type type = (tsp->type() == TempoSection::Ramp) ? TempoSection::Constant : TempoSection::Ramp; |