diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-03-28 05:21:29 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:12 +1000 |
| commit | 15f8f371c3854ae5370e01e643946a25e92a397b (patch) | |
| tree | 33dce18a4b5990e7fd953cd1495bc349cffef1a5 /libs/ardour/ardour/tempo.h | |
| parent | a7df009de73ad38026ff97d9aeafb8e2aa22e627 (diff) | |
Tempo rampo - tempo tick lines no longer assume constant tempo.
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 453081395c..e5b3ba4390 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -307,12 +307,13 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible framepos_t frame; const MeterSection* meter; const Tempo tempo; + double c; uint32_t bar; uint32_t beat; BBTPoint (const MeterSection& m, const Tempo& t, framepos_t f, - uint32_t b, uint32_t e) - : frame (f), meter (&m), tempo (t.beats_per_minute(), t.note_type()), bar (b), beat (e) {} + uint32_t b, uint32_t e, double func_c) + : frame (f), meter (&m), tempo (t.beats_per_minute(), t.note_type()), c (func_c), bar (b), beat (e) {} Timecode::BBT_Time bbt() const { return Timecode::BBT_Time (bar, beat, 0); } operator Timecode::BBT_Time() const { return bbt(); } @@ -458,6 +459,7 @@ private: const MeterSection& meter_section_at_locked (framepos_t frame) const; const TempoSection& tempo_section_at_locked (framepos_t frame) const; + const Tempo tempo_at_locked (const framepos_t& frame) const; bool check_solved (Metrics& metrics, bool by_frame); bool solve_map (Metrics& metrics, TempoSection* section, const Tempo& bpm, const framepos_t& frame); |