rename DoTheRightThing to RollIfAppropriate

8 files changed, 15 insertions, 15 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index c604d0c508..515982d0ab 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1611,7 +1611,7 @@ ARDOUR_UI::transport_goto_wallclock ()
 		samples += tmnow.tm_min * (60 * sample_rate);
 		samples += tmnow.tm_sec * sample_rate;
 
-		_session->request_locate (samples, DoTheRightThing);
+		_session->request_locate (samples, RollIfAppropriate);
 
 		/* force displayed area in editor to start no matter
 		   what "follow playhead" setting is.
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 690b2ffd56..0af9f234d7 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -2184,7 +2184,7 @@ AudioClock::locate ()
 		return;
 	}
 
-	_session->request_locate (current_time(), DoTheRightThing);
+	_session->request_locate (current_time(), RollIfAppropriate);
 }
 
 void
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index ca2b73d0a8..23a21da819 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1131,7 +1131,7 @@ Editor::control_scroll (float fraction)
 bool
 Editor::deferred_control_scroll (samplepos_t /*target*/)
 {
-	_session->request_locate (*_control_scroll_target, DoTheRightThing);
+	_session->request_locate (*_control_scroll_target, RollIfAppropriate);
 	/* reset for next stream */
 	_control_scroll_target = boost::none;
 	_dragging_playhead = false;
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index a2c43abeda..bd5e9f73c9 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -6002,7 +6002,7 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred)
 
 			/* didn't drag, so just locate */
 
-			_editor->session()->request_locate (grab_sample(), DoTheRightThing);
+			_editor->session()->request_locate (grab_sample(), RollIfAppropriate);
 
 		} else if (_operation == CreateCDMarker) {
 
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index d125536ac1..34a807b419 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -1768,7 +1768,7 @@ Editor::goto_nth_marker (int n)
 	for (Locations::LocationList::iterator i = ordered.begin(); n >= 0 && i != ordered.end(); ++i) {
 		if ((*i)->is_mark() && !(*i)->is_hidden() && !(*i)->is_session_range()) {
 			if (n == 0) {
-				_session->request_locate ((*i)->start(), DoTheRightThing);
+				_session->request_locate ((*i)->start(), RollIfAppropriate);
 				break;
 			}
 			--n;
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 050809dfe3..05bd71ad6b 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1351,7 +1351,7 @@ Editor::cursor_align (bool playhead_to_edit)
 			return;
 		}
 
-		_session->request_locate (selection->markers.front()->position(), DoTheRightThing);
+		_session->request_locate (selection->markers.front()->position(), RollIfAppropriate);
 
 	} else {
 		const int32_t divisions = get_grid_music_divisions (0);
@@ -2445,7 +2445,7 @@ Editor::jump_forward_to_mark ()
 		return;
 	}
 
-	_session->request_locate (pos, DoTheRightThing);
+	_session->request_locate (pos, RollIfAppropriate);
 }
 
 void
@@ -2469,7 +2469,7 @@ Editor::jump_backward_to_mark ()
 		return;
 	}
 
-	_session->request_locate (pos, DoTheRightThing);
+	_session->request_locate (pos, RollIfAppropriate);
 }
 
 void
@@ -6520,7 +6520,7 @@ void
 Editor::set_playhead_cursor ()
 {
 	if (entered_marker) {
-		_session->request_locate (entered_marker->position(), DoTheRightThing);
+		_session->request_locate (entered_marker->position(), RollIfAppropriate);
 	} else {
 		MusicSample where (0, 0);
 		bool ignored;
@@ -6532,7 +6532,7 @@ Editor::set_playhead_cursor ()
 		snap_to (where);
 
 		if (_session) {
-			_session->request_locate (where.sample, DoTheRightThing);
+			_session->request_locate (where.sample, RollIfAppropriate);
 		}
 	}
 
@@ -7525,7 +7525,7 @@ Editor::playhead_backward_to_grid ()
 			}
 		}
 
-		_session->request_locate (pos.sample, DoTheRightThing);
+		_session->request_locate (pos.sample, RollIfAppropriate);
 	}
 
 	/* keep PH visible in window */
diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc
index 4a8598d59c..8beef90509 100644
--- a/gtk2_ardour/editor_summary.cc
+++ b/gtk2_ardour/editor_summary.cc
@@ -437,7 +437,7 @@ EditorSummary::on_key_press_event (GdkEventKey* key)
 		if (key->keyval == set_playhead_accel.accel_key && (int) key->state == set_playhead_accel.accel_mods) {
 			if (_session) {
 				get_pointer (x, y);
-				_session->request_locate (_start + (samplepos_t) x / _x_scale, DoTheRightThing);
+				_session->request_locate (_start + (samplepos_t) x / _x_scale, RollIfAppropriate);
 				return true;
 			}
 		}
diff --git a/gtk2_ardour/mini_timeline.cc b/gtk2_ardour/mini_timeline.cc
index bd8274affd..ae9224495c 100644
--- a/gtk2_ardour/mini_timeline.cc
+++ b/gtk2_ardour/mini_timeline.cc
@@ -728,7 +728,7 @@ MiniTimeline::on_button_release_event (GdkEventButton *ev)
 	if (ev->y <= PADDING + _marker_height) {
 		for (JumpList::const_iterator i = _jumplist.begin (); i != _jumplist.end(); ++i) {
 			if (i->left <= ev->x && ev->x <= i->right) {
-				_session->request_locate (i->to, DoTheRightThing);
+				_session->request_locate (i->to, RollIfAppropriate);
 				return true;
 			}
 		}
@@ -736,7 +736,7 @@ MiniTimeline::on_button_release_event (GdkEventButton *ev)
 
 	if (ev->button == 1) {
 		samplepos_t when = _last_update_sample + (ev->x - get_width() * .5) / _px_per_sample;
-		_session->request_locate (std::max ((samplepos_t)0, when), DoTheRightThing);
+		_session->request_locate (std::max ((samplepos_t)0, when), RollIfAppropriate);
 	}
 
 	return true;
@@ -818,6 +818,6 @@ MiniTimeline::on_scroll_event (GdkEventScroll *ev)
 			return true;
 			break;
 	}
-	_session->request_locate (std::max ((samplepos_t)0, when), DoTheRightThing);
+	_session->request_locate (std::max ((samplepos_t)0, when), RollIfAppropriate);
 	return true;
 }