diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-04-17 06:18:05 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:15 +1000 |
| commit | 8b0a2897b97b2ff61fa5ba5ce112d015645a000b (patch) | |
| tree | 6b8fda8c43171818f253473a943a7e3697a30fee /libs/ardour/ardour/tempo.h | |
| parent | ea91593968250c1f06a2ddf4dc1eae8f3501697c (diff) | |
Tempo ramps - clean up some frame/beat ambiguity
Diffstat (limited to 'libs/ardour/ardour/tempo.h')
| -rw-r--r-- | libs/ardour/ardour/tempo.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index eea0d8f1d5..68e7481d1f 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -371,7 +371,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible const TempoSection& tempo_section_at (framepos_t frame) const; const MeterSection& meter_section_at (framepos_t frame) const; - const MeterSection& meter_section_at (const double& beat) const; + const MeterSection& meter_section_at_beat (double beat) const; TempoSection* add_tempo (const Tempo&, const double& pulse, TempoSection::Type type); TempoSection* add_tempo (const Tempo&, const framepos_t& frame, TempoSection::Type type); @@ -461,9 +461,11 @@ private: const MeterSection& meter_section_at_locked (const Metrics& metrics, framepos_t frame) const; const TempoSection& tempo_section_at_locked (const Metrics& metrics, framepos_t frame) const; + const MeterSection& meter_section_at_beat_locked (const Metrics& metrics, const double& beat) const; + const TempoSection& tempo_section_at_beat_locked (const Metrics& metrics, const double& beat) const; const Tempo tempo_at_locked (const Metrics& metrics, const framepos_t& frame) const; - bool check_solved (Metrics& metrics, bool by_frame); + bool check_solved (const Metrics& metrics, bool by_frame) const; bool set_active_tempos (const Metrics& metrics, const framepos_t& frame); bool solve_map (Metrics& metrics, TempoSection* section, const framepos_t& frame); bool solve_map (Metrics& metrics, TempoSection* section, const double& pulse); |