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, 12 insertions, 12 deletions

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index 2c64d6f4f3..2be9f8d6de 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -43,10 +43,10 @@ Editor::keyboard_selection_finish (bool /*add*/, Editing::EditIgnoreOption ign)
 {
 	if (_session) {
 
-		MusicFrame start (selection->time.start(), 0);
-		framepos_t end;
+		MusicSample start (selection->time.start(), 0);
+		samplepos_t end;
 		if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
-			end = _session->audible_frame();
+			end = _session->audible_sample();
 		} else {
 			end = get_preferred_edit_position(ign);
 		}
@@ -58,7 +58,7 @@ Editor::keyboard_selection_finish (bool /*add*/, Editing::EditIgnoreOption ign)
 		if ( (_edit_point == EditAtPlayhead) && selection->tracks.empty() )
 			select_all_tracks();
 
-		selection->set (start.frame, end);
+		selection->set (start.sample, end);
 
 		//if session is playing a range, cancel that
 		if (_session->get_play_range())
@@ -72,25 +72,25 @@ Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign)
 {
 	if (_session) {
 
-		MusicFrame start (0, 0);
-		MusicFrame end (selection->time.end_frame(), 0);
+		MusicSample start (0, 0);
+		MusicSample end (selection->time.end_sample(), 0);
 		if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
-			start.frame = _session->audible_frame();
+			start.sample = _session->audible_sample();
 		} else {
-			start.frame = get_preferred_edit_position(ign);
+			start.sample = get_preferred_edit_position(ign);
 		}
 
 		//snap the selection start/end
 		snap_to(start);
 
 		//if there's not already a sensible selection endpoint, go "forever"
-		if (start.frame > end.frame) {
+		if (start.sample > end.sample) {
 #ifdef MIXBUS
 			// 4hours at most.
 			// This works around a visual glitch in red-bordered selection rect.
-			end.frame = start.frame + _session->nominal_frame_rate() * 60 * 60 * 4;
+			end.sample = start.sample + _session->nominal_sample_rate() * 60 * 60 * 4;
 #else
-			end.frame = max_framepos;
+			end.sample = max_samplepos;
 #endif
 		}
 
@@ -98,7 +98,7 @@ Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign)
 		if ( selection->tracks.empty() )
 			select_all_tracks();
 
-		selection->set (start.frame, end.frame);
+		selection->set (start.sample, end.sample);
 
 		//if session is playing a range, cancel that
 		if (_session->get_play_range())