diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-03-04 07:32:00 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:11 +1000 |
| commit | 989089a4e997de450f1249bf24755a729f7568db (patch) | |
| tree | e9366b6f61f5f5adbd7f65ce1cc5be810949e1f0 /libs/ardour/ardour/tempo.h | |
| parent | aa95ffbc97ccab5cf5d43da9e89bdea85efdd406 (diff) | |
Tempo ramps - add method to handle beat-based tempo reordering. clean code.
Diffstat (limited to 'libs/ardour/ardour/tempo.h')
| -rw-r--r-- | libs/ardour/ardour/tempo.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 5dc9525e4d..02886f448a 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -375,14 +375,12 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible void remove_tempo (const TempoSection&, bool send_signal); void remove_meter (const MeterSection&, bool send_signal); - framepos_t compute_replacement_tempo_section (TempoSection* section, const Tempo& bpm, const double& beat); - Metrics get_new_order (TempoSection* section, const Tempo& bpm, const framepos_t& frame, const double& beat); - Metrics get_new_order (MeterSection* section, const Meter& mt, const framepos_t& frame, const double& beat); + framepos_t compute_new_tempo_frame (TempoSection* section, const Tempo& bpm, const double& beat); void replace_tempo (const TempoSection&, const Tempo&, const double& where, TempoSection::Type type); void replace_tempo (const TempoSection&, const Tempo&, const framepos_t& frame, TempoSection::Type type); - void gui_move_tempo (TempoSection*, const Tempo& bpm, const framepos_t& where, const double& beat); + void gui_move_tempo (TempoSection*, const Tempo& bpm, const framepos_t& where); void gui_move_meter (MeterSection*, const Meter& mt, const framepos_t& where, const double& beat); void replace_meter (const MeterSection&, const Meter&, const Timecode::BBT_Time& where); @@ -434,6 +432,10 @@ private: framecnt_t frame_at_tick_locked (double tick) const; framepos_t frame_time_locked (const Timecode::BBT_Time&); + Metrics get_new_order (TempoSection* section, const Tempo& bpm, const framepos_t& frame); + Metrics get_new_order (TempoSection* section, const Tempo& bpm, const double& beat); + Metrics get_new_order (MeterSection* section, const Meter& mt, const framepos_t& frame, const double& beat); + friend class ::BBTTest; friend class ::FrameposPlusBeatsTest; friend class ::TempoTest; |