X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=session_utils%2Ffix_bbtppq.cc;h=a5842ac7008e198e1e23f931eaee6bac24eba752;hb=9a45e0fde9eb6297ea4cc246aa2ef5d085ebe49b;hp=8dce59c35d995e88acde0fc6b7a5328ba8c3b938;hpb=4faf44588f806eac46b5c7ae5cc8058fc47da3f1;p=ardour.git

diff --git a/session_utils/fix_bbtppq.cc b/session_utils/fix_bbtppq.cc
index 8dce59c35d..a5842ac700 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);
@@ -135,7 +135,7 @@ ensure_per_region_source (Session* session, boost::shared_ptr<MidiRegion> region
 
 		Source::Lock newsrc_lock (newsrc->mutex());
 
-		write_bbt_source_to_source (region->midi_source(0), newsrc, newsrc_lock, region->pulse() - (region->start_beats() / 4.0));
+		write_bbt_source_to_source (region->midi_source(0), newsrc, newsrc_lock, (region->quarter_note() - region->start_beats()) / 4.0);
 
 		cout << UTILNAME << ":" << endl
 		     << " Created new midi source file" << endl
@@ -189,7 +189,7 @@ ensure_per_source_source (Session* session, boost::shared_ptr<MidiRegion> region
 
 		Source::Lock newsrc_lock (newsrc->mutex());
 
-		write_bbt_source_to_source (region->midi_source(0), newsrc, newsrc_lock, region->pulse() - (region->start_beats() / 4.0));
+		write_bbt_source_to_source (region->midi_source(0), newsrc, newsrc_lock, (region->quarter_note() - region->start_beats()) / 4.0);
 
 		cout << UTILNAME << ":" << endl
 		     << " Created new midi source file" << endl
@@ -206,13 +206,13 @@ 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();
 	region->set_position_lock_style (AudioTime);
-	region->set_start (tmap.frame_at_quarter_note (region->pulse() * 4.0) - tmap.frame_at_quarter_note ((region->pulse() * 4.0) - new_start_qn) + 1);
-	region->set_start (tmap.frame_at_quarter_note (region->pulse() * 4.0) - tmap.frame_at_quarter_note ((region->pulse() * 4.0) - new_start_qn));
+	region->set_start (tmap.frame_at_quarter_note (region->quarter_note()) - tmap.frame_at_quarter_note (region->quarter_note() - new_start_qn) + 1);
+	region->set_start (tmap.frame_at_quarter_note (region->quarter_note()) - tmap.frame_at_quarter_note (region->quarter_note() - new_start_qn));
 	region->set_position_lock_style (old_pls);
 
 }
@@ -222,14 +222,14 @@ 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();
 	region->set_position_lock_style (AudioTime);
-	region->set_length (tmap.frame_at_quarter_note ((region->pulse() * 4.0) + new_length_qn) + 1 - region->position(), 0);
-	region->set_length (tmap.frame_at_quarter_note ((region->pulse() * 4.0) + new_length_qn)- region->position(), 0);
+	region->set_length (tmap.frame_at_quarter_note (region->quarter_note() + new_length_qn) + 1 - region->position(), 0);
+	region->set_length (tmap.frame_at_quarter_note (region->quarter_note() + new_length_qn)- region->position(), 0);
 	region->set_position_lock_style (old_pls);
 }