diff --git a/libs/temporal/tempo.cc b/libs/temporal/tempo.cc index dd1700551f..84bca3a8d4 100644 --- a/libs/temporal/tempo.cc +++ b/libs/temporal/tempo.cc @@ -568,9 +568,9 @@ TempoPoint::superclock_at (Temporal::Beats const & qn) const } } - /* Now round up to the nearest sample-equivalent superclock value */ + /* Truncate to the nearest sample-equivalent superclock value */ - return sample_aligned_superclock (r, TEMPORAL_SAMPLE_RATE); + return (r / TEMPORAL_SAMPLE_RATE) * TEMPORAL_SAMPLE_RATE; } superclock_t diff --git a/libs/temporal/temporal/superclock.h b/libs/temporal/temporal/superclock.h index 8aa4bb2a99..a3f4783f30 100644 --- a/libs/temporal/temporal/superclock.h +++ b/libs/temporal/temporal/superclock.h @@ -47,7 +47,6 @@ static inline superclock_t superclock_ticks_per_second() { return _superclock_ti static inline superclock_t superclock_to_samples (superclock_t s, int sr) { return PBD::muldiv_floor (s, sr, superclock_ticks_per_second()); } static inline superclock_t samples_to_superclock (int64_t samples, int sr) { return PBD::muldiv_round (samples, superclock_ticks_per_second(), superclock_t (sr)); } -static inline superclock_t sample_aligned_superclock (superclock_t s, int sr) { return PBD::muldiv_floor (s, sr, sr); } LIBTEMPORAL_API extern int most_recent_engine_sample_rate;