diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-11-01 21:54:11 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-11-11 03:37:08 +1100 |
| commit | 594137f5cc5d641873b9002c28453166e81bac9e (patch) | |
| tree | 372b45608c4cb95e1d7a0fe4aa337e86e2deb793 /session_utils | |
| parent | 3db68b4f9e88658e8130769ee469f2a7b4de97a2 (diff) | |
remove public pulse methods from TempoMap.
- the only object whose musical position is not expressed in
quarter notes is MetricSection.
there is now no need to expose this.
Diffstat (limited to 'session_utils')
| -rw-r--r-- | session_utils/fix_bbtppq.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/session_utils/fix_bbtppq.cc b/session_utils/fix_bbtppq.cc index f86fe790e7..76d3284f9f 100644 --- a/session_utils/fix_bbtppq.cc +++ b/session_utils/fix_bbtppq.cc @@ -68,7 +68,7 @@ write_bbt_source_to_source (boost::shared_ptr<MidiSource> bbt_source, boost::sh TempoMap& map (source->session().tempo_map()); for (Evoral::Sequence<MidiModel::TimeType>::const_iterator i = bbt_source->model()->begin(MidiModel::TimeType(), true); i != bbt_source->model()->end(); ++i) { - const double new_time = map.quarter_note_at_beat ((*i).time().to_double() + map.beat_at_pulse (session_offset)) - (session_offset * 4.0); + const double new_time = map.quarter_note_at_beat ((*i).time().to_double() + map.beat_at_quarter_note (session_offset * 4.0)) - (session_offset * 4.0); Evoral::Event<Evoral::Beats> new_ev (*i, true); new_ev.set_time (Evoral::Beats (new_time)); source->append_event_beats (source_lock, new_ev); @@ -206,7 +206,7 @@ reset_start (Session* session, boost::shared_ptr<MidiRegion> region) { /* set start_beats to quarter note value from incorrect bbt*/ TempoMap& tmap (session->tempo_map()); - double new_start_qn = (tmap.pulse_at_beat (region->beat()) - tmap.pulse_at_beat (region->beat() - region->start_beats())) * 4.0; + double new_start_qn = tmap.quarter_note_at_beat (region->beat()) - tmap.quarter_note_at_beat (region->beat() - region->start_beats()); /* force a change to start and start_beats */ PositionLockStyle old_pls = region->position_lock_style(); @@ -222,8 +222,8 @@ reset_length (Session* session, boost::shared_ptr<MidiRegion> region) { /* set length_beats to quarter note value */ TempoMap& tmap (session->tempo_map()); - double new_length_qn = (tmap.pulse_at_beat (region->beat() + region->length_beats()) - - tmap.pulse_at_beat (region->beat())) * 4.0; + double new_length_qn = tmap.quarter_note_at_beat (region->beat() + region->length_beats()) + - tmap.quarter_note_at_beat (region->beat()); /* force a change to length and length_beats */ PositionLockStyle old_pls = region->position_lock_style(); |