rename Region pulse to pos_beats. use new beat distance api where required.

	- add more debugging output detecting regions whose
	  beat and frame position do not align on a playlist.
	  this is required as a check as we have never used
	  frame rounding on constant tempi before 8884a5723dc

1 files changed, 14 insertions, 18 deletions

diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc
index ec0cd95c8b..869cb487e4 100644
--- a/libs/ardour/midi_region.cc
+++ b/libs/ardour/midi_region.cc
@@ -107,7 +107,7 @@ MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other, frameoffset_t
 	, _start_beats (Properties::start_beats, 0.0)
 	, _length_beats (Properties::length_beats, other->_length_beats)
 {
-	_start_beats = (_session.tempo_map().exact_qn_at_frame (other->_position + offset, sub_num) - (other->pulse() * 4.0)) + other->_start_beats;
+	_start_beats = (_session.tempo_map().exact_qn_at_frame (other->_position + offset, sub_num) - other->pos_beats()) + other->_start_beats;
 
 	update_length_beats (sub_num);
 	register_properties ();
@@ -196,7 +196,7 @@ MidiRegion::clone (boost::shared_ptr<MidiSource> newsrc) const
 	plist.add (Properties::layer, 0);
 
 	boost::shared_ptr<MidiRegion> ret (boost::dynamic_pointer_cast<MidiRegion> (RegionFactory::create (newsrc, plist, true)));
-	ret->set_pulse (pulse());
+	ret->set_pos_beats (pos_beats());
 
 	return ret;
 }
@@ -227,7 +227,7 @@ void
 MidiRegion::set_start_beats_from_start_frames ()
 {
 	if (position_lock_style() == AudioTime) {
-		_start_beats = (pulse() * 4.0) - _session.tempo_map().quarter_note_at_frame (_position - _start);
+		_start_beats = pos_beats() - _session.tempo_map().quarter_note_at_frame (_position - _start);
 	}
 }
 
@@ -270,11 +270,10 @@ MidiRegion::update_after_tempo_map_change (bool /* send */)
 		  For now, the musical position at the region start is retained, but subsequent events
 		  will maintain their beat distance according to the map.
 		*/
-		_start = _session.tempo_map().frame_at_quarter_note (pulse() * 4.0)
-			- _session.tempo_map().frame_at_quarter_note ((pulse() * 4.0) - start_beats());
+		_start = _session.tempo_map().frames_between_quarter_notes (pos_beats() - start_beats(), pos_beats());
 
 		/* _length doesn't change for audio-locked regions. update length_beats to match. */
-		_length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - _session.tempo_map().quarter_note_at_frame (_position);
+		_length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - pos_beats();
 
 		s_and_l.add (Properties::start);
 		s_and_l.add (Properties::length_beats);
@@ -286,7 +285,7 @@ MidiRegion::update_after_tempo_map_change (bool /* send */)
 	Region::update_after_tempo_map_change (false);
 
 	/* _start has now been updated. */
-	_length = _session.tempo_map().frame_at_pulse (pulse() + (_length_beats / 4.0)) - _position;
+	_length = _session.tempo_map().frames_between_quarter_notes (pos_beats(), pos_beats() + _length_beats);
 
 	if (old_start != _start) {
 		s_and_l.add (Properties::start);
@@ -304,7 +303,7 @@ MidiRegion::update_after_tempo_map_change (bool /* send */)
 void
 MidiRegion::update_length_beats (const int32_t sub_num)
 {
-	_length_beats = _session.tempo_map().exact_qn_at_frame (_position + _length, sub_num) - (pulse() * 4.0);
+	_length_beats = _session.tempo_map().exact_qn_at_frame (_position + _length, sub_num) - pos_beats();
 }
 
 void
@@ -318,8 +317,7 @@ MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute, con
 	}
 
 	/* set _start to new position in tempo map */
-	_start = _session.tempo_map().frame_at_quarter_note (pulse() * 4.0)
-		- _session.tempo_map().frame_at_quarter_note ((pulse() * 4.0) - start_beats());
+	_start = _session.tempo_map().frames_between_quarter_notes (pos_beats() - start_beats(), pos_beats());
 
 	/* in construction from src */
 	if (_length_beats == 0.0) {
@@ -327,12 +325,12 @@ MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute, con
 	}
 
 	if (position_lock_style() == AudioTime) {
-		_length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - _session.tempo_map().quarter_note_at_frame (_position);
+		_length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - pos_beats();
 	} else {
 		/* leave _length_beats alone, and change _length to reflect the state of things
 		   at the new position (tempo map may dictate a different number of frames).
 		*/
-		Region::set_length_internal (_session.tempo_map().frame_at_quarter_note ((pulse() * 4.0) + length_beats()) - _position, sub_num);
+		Region::set_length_internal (_session.tempo_map().frames_between_quarter_notes (pos_beats(), pos_beats() + length_beats()), sub_num);
 	}
 }
 
@@ -416,8 +414,7 @@ MidiRegion::_read_at (const SourceList&              /*srcs*/,
 	     << " _position = " << _position
 	     << " _start = " << _start
 	     << " intoffset = " << internal_offset
-	     << " pulse = " << pulse()
-	     << " start_pulse = " << start_pulse()
+	     << " pos_beats = " << pos_beats()
 	     << " start_beat = " << _start_beats
 	     << endl;
 #endif
@@ -435,7 +432,7 @@ MidiRegion::_read_at (const SourceList&              /*srcs*/,
 		    tracker,
 		    filter,
 		    _filtered_parameters,
-		    pulse(),
+		    pos_beats(),
 		    _start_beats
 		    ) != to_read) {
 		return 0; /* "read nothing" */
@@ -626,15 +623,14 @@ MidiRegion::trim_to_internal (framepos_t position, framecnt_t length, const int3
 	if (_position != position) {
 
 		const double pos_qn = _session.tempo_map().exact_qn_at_frame (position, sub_num);
-		const double old_pos_qn = pulse() * 4.0;
+		const double old_pos_qn = pos_beats();
 
 		/* sets _pulse to new position.*/
 		set_position_internal (position, true, sub_num);
 		what_changed.add (Properties::position);
 
 		double new_start_qn = start_beats() + (pos_qn - old_pos_qn);
-		const framepos_t new_start = _session.tempo_map().frame_at_quarter_note (pos_qn)
-			- _session.tempo_map().frame_at_quarter_note (pos_qn - new_start_qn);
+		framepos_t new_start = _session.tempo_map().frames_between_quarter_notes (pos_qn - new_start_qn, pos_qn);
 
 		if (!verify_start_and_length (new_start, length)) {
 			return;