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 | |
parent | 820e9a43f54d9ec4c403492527e2f0a136f76569 (diff) |
Tempo ramps - clean up add/replace tempo
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/ardour/tempo.h | 8 | ||||
-rw-r--r-- | libs/ardour/tempo.cc | 69 |
2 files changed, 24 insertions, 53 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); diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index bd33c8d3b7..2ca330d1d8 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -882,39 +882,20 @@ TempoMap::do_insert (MetricSection* section) } void -TempoMap::replace_tempo_pulse (const TempoSection& ts, const Tempo& tempo, const double& pulse, TempoSection::Type type) +TempoMap::replace_tempo (const TempoSection& ts, const Tempo& tempo, const double& pulse, const framepos_t& frame, TempoSection::Type type, PositionLockStyle pls) { - { - Glib::Threads::RWLock::WriterLock lm (lock); - TempoSection& first (first_tempo()); - if (ts.pulse() != first.pulse()) { - remove_tempo_locked (ts); - add_tempo_pulse_locked (tempo, pulse, true, type); - } else { - first.set_type (type); - { - /* cannot move the first tempo section */ - *static_cast<Tempo*>(&first) = tempo; - recompute_map (_metrics); - } - } - } + const bool locked_to_meter = ts.locked_to_meter(); - PropertyChanged (PropertyChange ()); -} - -void -TempoMap::replace_tempo_frame (const TempoSection& ts, const Tempo& tempo, const framepos_t& frame, TempoSection::Type type) -{ { Glib::Threads::RWLock::WriterLock lm (lock); TempoSection& first (first_tempo()); if (ts.frame() != first.frame()) { remove_tempo_locked (ts); - add_tempo_frame_locked (tempo, frame, true, type); + add_tempo_locked (tempo, pulse, frame, type, pls, true, locked_to_meter); } else { first.set_type (type); first.set_pulse (0.0); + first.set_frame (frame); first.set_position_lock_style (AudioTime); { /* cannot move the first tempo section */ @@ -931,9 +912,10 @@ TempoSection* TempoMap::add_tempo_pulse (const Tempo& tempo, const double& pulse, ARDOUR::TempoSection::Type type) { TempoSection* ts = 0; + const framepos_t frame = frame_at_pulse_locked (_metrics, pulse); { Glib::Threads::RWLock::WriterLock lm (lock); - ts = add_tempo_pulse_locked (tempo, pulse, true, type); + ts = add_tempo_locked (tempo, pulse, frame, type, MusicTime, true); } PropertyChanged (PropertyChange ()); @@ -945,9 +927,10 @@ TempoSection* TempoMap::add_tempo_frame (const Tempo& tempo, const framepos_t& frame, ARDOUR::TempoSection::Type type) { TempoSection* ts = 0; + const double pulse = pulse_at_frame_locked (_metrics, frame); { Glib::Threads::RWLock::WriterLock lm (lock); - ts = add_tempo_frame_locked (tempo, frame, true, type); + ts = add_tempo_locked (tempo, pulse, frame, type, AudioTime, true); } @@ -957,29 +940,20 @@ TempoMap::add_tempo_frame (const Tempo& tempo, const framepos_t& frame, ARDOUR:: } TempoSection* -TempoMap::add_tempo_pulse_locked (const Tempo& tempo, double pulse, bool recompute, ARDOUR::TempoSection::Type type) +TempoMap::add_tempo_locked (const Tempo& tempo, double pulse, framepos_t frame + , TempoSection::Type type, PositionLockStyle pls, bool recompute, bool locked_to_meter) { - TempoSection* t = new TempoSection (pulse, 0, tempo.beats_per_minute(), tempo.note_type(), type, MusicTime); + TempoSection* t = new TempoSection (pulse, frame, tempo.beats_per_minute(), tempo.note_type(), type, pls); + t->set_locked_to_meter (locked_to_meter); do_insert (t); if (recompute) { - solve_map_pulse (_metrics, t, t->pulse()); - recompute_meters (_metrics); - } - - return t; -} - -TempoSection* -TempoMap::add_tempo_frame_locked (const Tempo& tempo, framepos_t frame, bool recompute, ARDOUR::TempoSection::Type type) -{ - TempoSection* t = new TempoSection (0.0, frame, tempo.beats_per_minute(), tempo.note_type(), type, AudioTime); - - do_insert (t); - - if (recompute) { - solve_map_frame (_metrics, t, t->frame()); + if (pls == AudioTime) { + solve_map_frame (_metrics, t, t->frame()); + } else { + solve_map_pulse (_metrics, t, t->pulse()); + } recompute_meters (_metrics); } @@ -1107,13 +1081,10 @@ MeterSection* TempoMap::add_meter_frame_locked (const Meter& meter, framepos_t frame, double beat, const Timecode::BBT_Time& where, bool recompute) { /* add meter-locked tempo */ - TempoSection* t = add_tempo_frame_locked (tempo_at_locked (_metrics, frame), frame, true, TempoSection::Ramp); - if (t) { - t->set_locked_to_meter (true); - } + const double pulse = pulse_at_frame_locked (_metrics, frame); + TempoSection* t = add_tempo_locked (tempo_at_locked (_metrics, frame), pulse, frame, TempoSection::Ramp, AudioTime, true, true); - MeterSection* new_meter = new MeterSection (0.0, frame, beat, where, meter.divisions_per_bar(), meter.note_divisor(), AudioTime); - new_meter->set_pulse (pulse_at_frame_locked (_metrics, frame)); + MeterSection* new_meter = new MeterSection (pulse, frame, beat, where, meter.divisions_per_bar(), meter.note_divisor(), AudioTime); do_insert (new_meter); |