diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-11-04 02:12:20 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-11-11 03:37:08 +1100 |
| commit | 93ca7b42fb36e56f6e12d228398073c3a68f2e27 (patch) | |
| tree | 8322bfd26a715fad8cf27b13d3adece1a951c7b1 /libs/ardour/tempo.cc | |
| parent | 99e707217b3196d200c04aeb73e198d60b1c4e68 (diff) | |
remove unused TempoMap::tempo_at_beat(). implement unused tempo_at_quarter_note().
Diffstat (limited to 'libs/ardour/tempo.cc')
| -rw-r--r-- | libs/ardour/tempo.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 07c008ab7c..3671def7ff 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -1730,13 +1730,11 @@ TempoMap::pulse_at_tempo_locked (const Metrics& metrics, const Tempo& tempo) con * @return the Tempo at the supplied quarter-note. */ Tempo -TempoMap::tempo_at_beat (const double& beat) const +TempoMap::tempo_at_quarter_note (const double& qn) const { Glib::Threads::RWLock::ReaderLock lm (lock); - const MeterSection* prev_m = &meter_section_at_beat_locked (_metrics, beat); - const TempoSection* prev_t = &tempo_section_at_beat_locked (_metrics, beat); - return Tempo (prev_t->tempo_at_pulse (((beat - prev_m->beat()) / prev_m->note_divisor()) + prev_m->pulse()), prev_t->note_type()); + return tempo_at_pulse_locked (_metrics, qn / 4.0); } /** Returns the position in quarter-note beats corresponding to the supplied Tempo. @@ -1745,12 +1743,11 @@ TempoMap::tempo_at_beat (const double& beat) const * is equal to that of the Tempo. currently ignores note_type. */ double -TempoMap::beat_at_tempo (const Tempo& tempo) const +TempoMap::quarter_note_at_tempo (const Tempo& tempo) const { Glib::Threads::RWLock::ReaderLock lm (lock); - const double pulse = pulse_at_tempo_locked (_metrics, tempo); - return beat_at_pulse_locked (_metrics, pulse); + return pulse_at_tempo_locked (_metrics, tempo) * 4.0;; } /** Returns the whole-note pulse corresponding to the supplied BBT (meter-based) beat. |