From 594137f5cc5d641873b9002c28453166e81bac9e Mon Sep 17 00:00:00 2001 From: nick_m Date: Tue, 1 Nov 2016 21:54:11 +1100 Subject: 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. --- session_utils/fix_bbtppq.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'session_utils') 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 bbt_source, boost::sh TempoMap& map (source->session().tempo_map()); for (Evoral::Sequence::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 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 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 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(); -- cgit v1.2.3