diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-10-09 03:46:50 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-10-09 03:46:50 +1100 |
| commit | 2f72b4238544261fbb40e17189706d3fcdd52b7d (patch) | |
| tree | 1e44a0d87618c5e38d17993673e5c9fd857264c6 /libs/ardour/ardour/tempo.h | |
| parent | b1df56d531869ef737268b2152d79e71c817e27b (diff) | |
TempoSection methods deal in beats rather than pulses per minute.
- removes note type from curve function for a slightly more
accurate result.
Diffstat (limited to 'libs/ardour/ardour/tempo.h')
| -rw-r--r-- | libs/ardour/ardour/tempo.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index d3fa43a100..138a199545 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -62,7 +62,6 @@ class LIBARDOUR_API Tempo { double beats_per_minute () const { return _beats_per_minute; } void set_beats_per_minute (double bpm) { _beats_per_minute = bpm; } double note_type () const { return _note_type; } - double pulses_per_minute () const { return _beats_per_minute / _note_type; } /** audio samples per beat * @param sr samplerate */ @@ -221,14 +220,14 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo { double a_func (double end_tpm, double c_func) const; double c_func (double end_tpm, double end_time) const; - double pulse_tempo_at_time (const double& time) const; - double time_at_pulse_tempo (const double& pulse_tempo) const; + double _tempo_at_time (const double& time) const; + double _time_at_tempo (const double& tempo) const; - double pulse_tempo_at_pulse (const double& pulse) const; - double pulse_at_pulse_tempo (const double& pulse_tempo) const; + double _tempo_at_pulse (const double& pulse) const; + double _pulse_at_tempo (const double& tempo) const; - double pulse_at_time (const double& time) const; - double time_at_pulse (const double& pulse) const; + double _pulse_at_time (const double& time) const; + double _time_at_pulse (const double& pulse) const; /* this value provides a fractional offset into the bar in which the tempo section is located in. A value of 0.0 indicates that |