diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-09-03 01:22:41 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-09-03 01:22:41 +1000 |
| commit | d50df82799665e4bbf7c9d8cf2a7c2af866f0da2 (patch) | |
| tree | 8c723208fdb2dd1fb9d52f78788eed1d6e52a567 /libs/ardour/ardour | |
| parent | d7879486a05d8be7a10f7bd24e6272b567fae782 (diff) | |
Fix various paste errors in tempo.cc. Should fix recent regressions.
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/tempo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index ebc02284db..c58465e46f 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -70,7 +70,7 @@ class LIBARDOUR_API Tempo { return (60.0 * sr) / _beats_per_minute; } double frames_per_pulse (framecnt_t sr) const { - return (_note_type * 60.0 * sr) / _beats_per_minute; + return (4.0 * 60.0 * sr) / _beats_per_minute; } protected: @@ -414,7 +414,6 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible const Meter& meter_at_frame (framepos_t) const; - /* you probably only need to use pulses when moving tempos */ double pulse_at_beat (const double& beat) const; double beat_at_pulse (const double& pulse) const; @@ -498,6 +497,7 @@ private: framepos_t frame_at_quarter_note_locked (const Metrics& metrics, const double quarter_note) const; double quarter_note_at_frame_locked (const Metrics& metrics, const framepos_t frame) const; double quarter_note_at_beat_locked (const Metrics& metrics, const double beat) const; + double beat_at_quarter_note_locked (const Metrics& metrics, const double beat) const; const TempoSection& tempo_section_at_frame_locked (const Metrics& metrics, framepos_t frame) const; const TempoSection& tempo_section_at_beat_locked (const Metrics& metrics, const double& beat) const; |