From 7f19f13ea96eeb4aa7e33fd03b8f9e6c5c4a1053 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 6 Jan 2021 10:06:14 -0700 Subject: [PATCH] libtemporal: superclocks_per_bar/grid() do not need a sample rate argument, so remove it --- libs/temporal/tempo.cc | 6 +++--- libs/temporal/temporal/tempo.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/temporal/tempo.cc b/libs/temporal/tempo.cc index 5dd2274743..ef235d55f1 100644 --- a/libs/temporal/tempo.cc +++ b/libs/temporal/tempo.cc @@ -1140,7 +1140,7 @@ TempoMap::move_meter (MeterPoint const & mp, timepos_t const & when, bool push) * direction is), don't move */ - const superclock_t one_bar = metric.superclocks_per_bar (TEMPORAL_SAMPLE_RATE); + const superclock_t one_bar = metric.superclocks_per_bar (); if (abs (sc - mp.sclock()) < one_bar / 2) { return false; } @@ -2135,7 +2135,7 @@ TempoMap::bbt_walk (BBT_Time const & bbt, BBT_Offset const & o) const for (int32_t b = 0; b < offset.beats; ++b) { TEMPO_CHECK_FOR_NEW_METRIC; - pos += metric.superclocks_per_grid (TEMPORAL_SAMPLE_RATE); + pos += metric.superclocks_per_grid (); } /* add each bar, 1 by 1, rechecking to see if there's a new @@ -2146,7 +2146,7 @@ TempoMap::bbt_walk (BBT_Time const & bbt, BBT_Offset const & o) const TEMPO_CHECK_FOR_NEW_METRIC; - pos += metric.superclocks_per_bar (TEMPORAL_SAMPLE_RATE); + pos += metric.superclocks_per_bar (); } return metric.bbt_at (pos); diff --git a/libs/temporal/temporal/tempo.h b/libs/temporal/temporal/tempo.h index b2b96c61be..33cda95243 100644 --- a/libs/temporal/temporal/tempo.h +++ b/libs/temporal/temporal/tempo.h @@ -471,11 +471,11 @@ class LIBTEMPORAL_API TempoMetric { /* combination methods that require both tempo and meter information */ - superclock_t superclocks_per_bar (samplecnt_t sr) const { - return superclocks_per_grid (sr) * _meter->divisions_per_bar(); + superclock_t superclocks_per_bar () const { + return superclocks_per_grid () * _meter->divisions_per_bar(); } - superclock_t superclocks_per_grid (samplecnt_t sr) const { - return llrint (_tempo->superclocks_per_note_type() * ((double) _tempo->note_type() / _meter->note_value())); + superclock_t superclocks_per_grid () const { + return int_div_round (_tempo->superclocks_per_note_type() * _tempo->note_type(), (int64_t) _meter->note_value()); } superclock_t superclocks_per_note_type_at_superclock (superclock_t sc) const { @@ -489,7 +489,7 @@ class LIBTEMPORAL_API TempoMetric { superclock_t superclock_at (BBT_Time const &) const; samplepos_t samples_per_bar (samplecnt_t sr) const { - return superclock_to_samples (superclocks_per_bar (sr), sr); + return superclock_to_samples (superclocks_per_bar (), sr); } Beats quarters_at_sample (samplepos_t sc) const { return quarters_at_superclock (samples_to_superclock (sc, TEMPORAL_SAMPLE_RATE)); }