globally change all use of "frame" to refer to audio into "sample".

Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode
and video in order to keep the legible

1 files changed, 55 insertions, 55 deletions

diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc
index 51b87bdced..cbb9f2d935 100644
--- a/libs/ardour/midi_region.cc
+++ b/libs/ardour/midi_region.cc
@@ -105,7 +105,7 @@ MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other)
 }
 
 /** Create a new MidiRegion that is part of an existing one */
-MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other, MusicFrame offset)
+MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other, MusicSample offset)
 	: Region (other, offset)
 	, _start_beats (Properties::start_beats, other->_start_beats)
 	, _length_beats (Properties::length_beats, other->_length_beats)
@@ -114,8 +114,8 @@ MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other, MusicFrame of
 
 	register_properties ();
 
-	const double offset_quarter_note = _session.tempo_map().exact_qn_at_frame (other->_position + offset.frame, offset.division) - other->_quarter_note;
-	if (offset.frame != 0) {
+	const double offset_quarter_note = _session.tempo_map().exact_qn_at_sample (other->_position + offset.sample, offset.division) - other->_quarter_note;
+	if (offset.sample != 0) {
 		_start_beats = other->_start_beats + offset_quarter_note;
 		_length_beats = other->_length_beats - offset_quarter_note;
 	}
@@ -141,9 +141,9 @@ MidiRegion::do_export (string path) const
 	assert (!Glib::file_test (path, Glib::FILE_TEST_EXISTS));
 	newsrc = boost::dynamic_pointer_cast<MidiSource>(
 		SourceFactory::createWritable(DataType::MIDI, _session,
-		                              path, false, _session.frame_rate()));
+		                              path, false, _session.sample_rate()));
 
-	BeatsFramesConverter bfc (_session.tempo_map(), _position);
+	BeatsSamplesConverter bfc (_session.tempo_map(), _position);
 	Evoral::Beats const bbegin = bfc.from (_start);
 	Evoral::Beats const bend = bfc.from (_start + _length);
 
@@ -172,14 +172,14 @@ MidiRegion::clone (string path) const
 	assert (!Glib::file_test (path, Glib::FILE_TEST_EXISTS));
 	newsrc = boost::dynamic_pointer_cast<MidiSource>(
 		SourceFactory::createWritable(DataType::MIDI, _session,
-					      path, false, _session.frame_rate()));
+					      path, false, _session.sample_rate()));
 	return clone (newsrc);
 }
 
 boost::shared_ptr<MidiRegion>
 MidiRegion::clone (boost::shared_ptr<MidiSource> newsrc) const
 {
-	BeatsFramesConverter bfc (_session.tempo_map(), _position);
+	BeatsSamplesConverter bfc (_session.tempo_map(), _position);
 	Evoral::Beats const bbegin = bfc.from (_start);
 	Evoral::Beats const bend = bfc.from (_start + _length);
 
@@ -235,20 +235,20 @@ MidiRegion::post_set (const PropertyChange& pc)
 	}
 
 	if (pc.contains (Properties::start) && !pc.contains (Properties::start_beats)) {
-		set_start_beats_from_start_frames ();
+		set_start_beats_from_start_samples ();
 	}
 }
 
 void
-MidiRegion::set_start_beats_from_start_frames ()
+MidiRegion::set_start_beats_from_start_samples ()
 {
 	if (position_lock_style() == AudioTime) {
-		_start_beats = quarter_note() - _session.tempo_map().quarter_note_at_frame (_position - _start);
+		_start_beats = quarter_note() - _session.tempo_map().quarter_note_at_sample (_position - _start);
 	}
 }
 
 void
-MidiRegion::set_length_internal (framecnt_t len, const int32_t sub_num)
+MidiRegion::set_length_internal (samplecnt_t len, const int32_t sub_num)
 {
 	Region::set_length_internal (len, sub_num);
 	update_length_beats (sub_num);
@@ -263,9 +263,9 @@ MidiRegion::update_after_tempo_map_change (bool /* send */)
 		return;
 	}
 
-	const framepos_t old_pos = _position;
-	const framepos_t old_length = _length;
-	const framepos_t old_start = _start;
+	const samplepos_t old_pos = _position;
+	const samplepos_t old_length = _length;
+	const samplepos_t old_start = _start;
 
 	PropertyChange s_and_l;
 
@@ -286,10 +286,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().frames_between_quarter_notes (quarter_note() - start_beats(), quarter_note());
+		_start = _session.tempo_map().samples_between_quarter_notes (quarter_note() - start_beats(), quarter_note());
 
 		/* _length doesn't change for audio-locked regions. update length_beats to match. */
-		_length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - quarter_note();
+		_length_beats = _session.tempo_map().quarter_note_at_sample (_position + _length) - quarter_note();
 
 		s_and_l.add (Properties::start);
 		s_and_l.add (Properties::length_beats);
@@ -301,7 +301,7 @@ MidiRegion::update_after_tempo_map_change (bool /* send */)
 	Region::update_after_tempo_map_change (false);
 
 	/* _start has now been updated. */
-	_length = max ((framecnt_t) 1, _session.tempo_map().frames_between_quarter_notes (quarter_note(), quarter_note() + _length_beats));
+	_length = max ((samplecnt_t) 1, _session.tempo_map().samples_between_quarter_notes (quarter_note(), quarter_note() + _length_beats));
 
 	if (old_start != _start) {
 		s_and_l.add (Properties::start);
@@ -319,11 +319,11 @@ 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) - quarter_note();
+	_length_beats = _session.tempo_map().exact_qn_at_sample (_position + _length, sub_num) - quarter_note();
 }
 
 void
-MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute, const int32_t sub_num)
+MidiRegion::set_position_internal (samplepos_t pos, bool allow_bbt_recompute, const int32_t sub_num)
 {
 	Region::set_position_internal (pos, allow_bbt_recompute, sub_num);
 
@@ -333,7 +333,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().frames_between_quarter_notes (quarter_note() - start_beats(), quarter_note());
+	_start = _session.tempo_map().samples_between_quarter_notes (quarter_note() - start_beats(), quarter_note());
 
 	/* in construction from src */
 	if (_length_beats == 0.0) {
@@ -341,12 +341,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) - quarter_note();
+		_length_beats = _session.tempo_map().quarter_note_at_sample (_position + _length) - quarter_note();
 	} 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).
+		   at the new position (tempo map may dictate a different number of samples).
 		*/
-		Region::set_length_internal (_session.tempo_map().frames_between_quarter_notes (quarter_note(), quarter_note() + length_beats()), sub_num);
+		Region::set_length_internal (_session.tempo_map().samples_between_quarter_notes (quarter_note(), quarter_note() + length_beats()), sub_num);
 	}
 }
 
@@ -355,24 +355,24 @@ MidiRegion::set_position_music_internal (double qn)
 {
 	Region::set_position_music_internal (qn);
 	/* set _start to new position in tempo map */
-	_start = _session.tempo_map().frames_between_quarter_notes (quarter_note() - start_beats(), quarter_note());
+	_start = _session.tempo_map().samples_between_quarter_notes (quarter_note() - start_beats(), quarter_note());
 
 	if (position_lock_style() == AudioTime) {
-		_length_beats = _session.tempo_map().quarter_note_at_frame (_position + _length) - quarter_note();
+		_length_beats = _session.tempo_map().quarter_note_at_sample (_position + _length) - quarter_note();
 
 	} 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).
+		   at the new position (tempo map may dictate a different number of samples).
 		*/
-		_length = _session.tempo_map().frames_between_quarter_notes (quarter_note(), quarter_note() + length_beats());
+		_length = _session.tempo_map().samples_between_quarter_notes (quarter_note(), quarter_note() + length_beats());
 	}
 }
 
-framecnt_t
-MidiRegion::read_at (Evoral::EventSink<framepos_t>& out,
-                     framepos_t                     position,
-                     framecnt_t                     dur,
-                     Evoral::Range<framepos_t>*     loop_range,
+samplecnt_t
+MidiRegion::read_at (Evoral::EventSink<samplepos_t>& out,
+                     samplepos_t                     position,
+                     samplecnt_t                     dur,
+                     Evoral::Range<samplepos_t>*     loop_range,
                      MidiCursor&                    cursor,
                      uint32_t                       chan_n,
                      NoteMode                       mode,
@@ -382,11 +382,11 @@ MidiRegion::read_at (Evoral::EventSink<framepos_t>& out,
 	return _read_at (_sources, out, position, dur, loop_range, cursor, chan_n, mode, tracker, filter);
 }
 
-framecnt_t
-MidiRegion::master_read_at (MidiRingBuffer<framepos_t>& out,
-                            framepos_t                  position,
-                            framecnt_t                  dur,
-                            Evoral::Range<framepos_t>*  loop_range,
+samplecnt_t
+MidiRegion::master_read_at (MidiRingBuffer<samplepos_t>& out,
+                            samplepos_t                  position,
+                            samplecnt_t                  dur,
+                            Evoral::Range<samplepos_t>*  loop_range,
                             MidiCursor&                 cursor,
                             uint32_t                    chan_n,
                             NoteMode                    mode) const
@@ -394,20 +394,20 @@ MidiRegion::master_read_at (MidiRingBuffer<framepos_t>& out,
 	return _read_at (_master_sources, out, position, dur, loop_range, cursor, chan_n, mode); /* no tracker */
 }
 
-framecnt_t
+samplecnt_t
 MidiRegion::_read_at (const SourceList&              /*srcs*/,
-                      Evoral::EventSink<framepos_t>& dst,
-                      framepos_t                     position,
-                      framecnt_t                     dur,
-                      Evoral::Range<framepos_t>*     loop_range,
+                      Evoral::EventSink<samplepos_t>& dst,
+                      samplepos_t                     position,
+                      samplecnt_t                     dur,
+                      Evoral::Range<samplepos_t>*     loop_range,
                       MidiCursor&                    cursor,
                       uint32_t                       chan_n,
                       NoteMode                       mode,
                       MidiStateTracker*              tracker,
                       MidiChannelFilter*             filter) const
 {
-	frameoffset_t internal_offset = 0;
-	framecnt_t    to_read         = 0;
+	sampleoffset_t internal_offset = 0;
+	samplecnt_t    to_read         = 0;
 
 	/* precondition: caller has verified that we cover the desired section */
 
@@ -453,14 +453,14 @@ MidiRegion::_read_at (const SourceList&              /*srcs*/,
 	     << endl;
 #endif
 
-	/* This call reads events from a source and writes them to `dst' timed in session frames */
+	/* This call reads events from a source and writes them to `dst' timed in session samples */
 
 	if (src->midi_read (
 		    lm, // source lock
 		    dst, // destination buffer
-		    _position - _start, // start position of the source in session frames
+		    _position - _start, // start position of the source in session samples
 		    _start + internal_offset, // where to start reading in the source
-		    to_read, // read duration in frames
+		    to_read, // read duration in samples
 		    loop_range,
 		    cursor,
 		    tracker,
@@ -602,7 +602,7 @@ MidiRegion::model_shifted (double qn_distance)
 	if (!_ignore_shift) {
 		PropertyChange what_changed;
 		_start_beats += qn_distance;
-		framepos_t const new_start = _session.tempo_map().frames_between_quarter_notes (_quarter_note - _start_beats, _quarter_note);
+		samplepos_t const new_start = _session.tempo_map().samples_between_quarter_notes (_quarter_note - _start_beats, _quarter_note);
 		_start = new_start;
 		what_changed.add (Properties::start);
 		what_changed.add (Properties::start_beats);
@@ -643,7 +643,7 @@ MidiRegion::model_automation_state_changed (Evoral::Parameter const & p)
 void
 MidiRegion::fix_negative_start ()
 {
-	BeatsFramesConverter c (_session.tempo_map(), _position);
+	BeatsSamplesConverter c (_session.tempo_map(), _position);
 
 	_ignore_shift = true;
 
@@ -654,15 +654,15 @@ MidiRegion::fix_negative_start ()
 }
 
 void
-MidiRegion::set_start_internal (framecnt_t s, const int32_t sub_num)
+MidiRegion::set_start_internal (samplecnt_t s, const int32_t sub_num)
 {
 	Region::set_start_internal (s, sub_num);
 
-	set_start_beats_from_start_frames ();
+	set_start_beats_from_start_samples ();
 }
 
 void
-MidiRegion::trim_to_internal (framepos_t position, framecnt_t length, const int32_t sub_num)
+MidiRegion::trim_to_internal (samplepos_t position, samplecnt_t length, const int32_t sub_num)
 {
 	if (locked()) {
 		return;
@@ -674,14 +674,14 @@ MidiRegion::trim_to_internal (framepos_t position, framecnt_t length, const int3
 	/* Set position before length, otherwise for MIDI regions this bad thing happens:
 	 * 1. we call set_length_internal; length in beats is computed using the region's current
 	 *    (soon-to-be old) position
-	 * 2. we call set_position_internal; position is set and length in frames re-computed using
+	 * 2. we call set_position_internal; position is set and length in samples re-computed using
 	 *    length in beats from (1) but at the new position, which is wrong if the region
 	 *    straddles a tempo/meter change.
 	 */
 
 	if (_position != position) {
 
-		const double pos_qn = _session.tempo_map().exact_qn_at_frame (position, sub_num);
+		const double pos_qn = _session.tempo_map().exact_qn_at_sample (position, sub_num);
 		const double old_pos_qn = quarter_note();
 
 		/* sets _pulse to new position.*/
@@ -689,7 +689,7 @@ MidiRegion::trim_to_internal (framepos_t position, framecnt_t length, const int3
 		what_changed.add (Properties::position);
 
 		double new_start_qn = start_beats() + (pos_qn - old_pos_qn);
-		framepos_t new_start = _session.tempo_map().frames_between_quarter_notes (pos_qn - new_start_qn, pos_qn);
+		samplepos_t new_start = _session.tempo_map().samples_between_quarter_notes (pos_qn - new_start_qn, pos_qn);
 
 		if (!verify_start_and_length (new_start, length)) {
 			return;