diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-05-27 01:44:58 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:17 +1000 |
| commit | baf8f379677d6fea53d665aaff1945ccd896a6fe (patch) | |
| tree | b5016ae67469779c173b9d1e9a0d791a878d5e46 /libs | |
| parent | 8f3bc6f8099d7fc3bcc7f0dc88434afa0084e35f (diff) | |
Tempo ramps - rename meter_at() -> meter_at_frame() & make the ticker slightly more efficient.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/tempo.h | 3 | ||||
| -rw-r--r-- | libs/ardour/tempo.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/ticker.cc | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 52caaf5030..f08ffa64b9 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -332,8 +332,6 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible double frames_per_beat_at (const framepos_t&, const framecnt_t& sr) const; - const Meter& meter_at (framepos_t) const; - const TempoSection& tempo_section_at (framepos_t frame) const; const MeterSection& meter_section_at (framepos_t frame) const; const MeterSection& meter_section_at_beat (double beat) const; @@ -417,6 +415,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible framecnt_t frame_at_pulse (const double& pulse) const; const Tempo tempo_at_frame (const framepos_t& frame) const; + const Meter& meter_at_frame (framepos_t) const; double beat_at_bbt (const Timecode::BBT_Time& bbt); Timecode::BBT_Time bbt_at_beat (const double& beats); diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index fcb840c0ed..36ac3a8203 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -3023,7 +3023,7 @@ TempoMap::meter_section_at_beat (double beat) const } const Meter& -TempoMap::meter_at (framepos_t frame) const +TempoMap::meter_at_frame (framepos_t frame) const { TempoMetric m (metric_at (frame)); return m.meter(); diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc index 58a1c4573d..def219a433 100644 --- a/libs/ardour/ticker.cc +++ b/libs/ardour/ticker.cc @@ -68,9 +68,10 @@ public: s->bbt_time (this->frame, *this); const TempoMap& tempo = s->tempo_map(); + const Meter& meter = tempo.meter_at_frame (frame); - const double divisions = tempo.meter_at(frame).divisions_per_bar(); - const double divisor = tempo.meter_at(frame).note_divisor(); + const double divisions = meter.divisions_per_bar(); + const double divisor = meter.note_divisor(); const double qnote_scale = divisor * 0.25f; double mb; |