diff options
author | nick_m <mainsbridge@gmail.com> | 2016-05-20 06:39:48 +1000 |
---|---|---|
committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:16 +1000 |
commit | 82d876b48b9de4e178547d00e91e6aa098ae56a7 (patch) | |
tree | 61653c2fbc3fce5b6b974f3161263ec2988c6806 /libs/ardour/ardour/tempo.h | |
parent | 820e9a43f54d9ec4c403492527e2f0a136f76569 (diff) |
Tempo ramps - clean up add/replace tempo
Diffstat (limited to 'libs/ardour/ardour/tempo.h')
-rw-r--r-- | libs/ardour/ardour/tempo.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 63f09d20be..61d193ff95 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -402,8 +402,8 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible framepos_t predict_tempo_frame (TempoSection* section, const Timecode::BBT_Time& bbt); double predict_tempo_pulse (TempoSection* section, const framepos_t& frame); - void replace_tempo_pulse (const TempoSection&, const Tempo&, const double& where, TempoSection::Type type); - void replace_tempo_frame (const TempoSection&, const Tempo&, const framepos_t& frame, TempoSection::Type type); + void replace_tempo (const TempoSection&, const Tempo&, const double& pulse, const framepos_t& frame + , TempoSection::Type type, PositionLockStyle pls); void gui_move_tempo_frame (TempoSection*, const framepos_t& frame); void gui_move_tempo_beat (TempoSection*, const double& beat); @@ -516,8 +516,8 @@ private: void do_insert (MetricSection* section); - TempoSection* add_tempo_pulse_locked (const Tempo&, double pulse, bool recompute, TempoSection::Type type); - TempoSection* add_tempo_frame_locked (const Tempo&, framepos_t frame, bool recompute, TempoSection::Type type); + TempoSection* add_tempo_locked (const Tempo&, double pulse, framepos_t frame + , TempoSection::Type type, PositionLockStyle pls, bool recompute, bool locked_to_meter = false); MeterSection* add_meter_beat_locked (const Meter&, double beat, const Timecode::BBT_Time& where, bool recompute); MeterSection* add_meter_frame_locked (const Meter&, framepos_t frame, double beat, const Timecode::BBT_Time& where, bool recompute); |