From b4eba1a30b50982f6c276796cc9ba11b581f0863 Mon Sep 17 00:00:00 2001
From: Ben Loftis <ben@harrisonconsoles.com>
Date: Fri, 18 Jun 2021 12:22:59 -0500
Subject: [PATCH] Default_Play_Speed: prep work (gtk2)

* request_transport_speed should -never- set default_play_speed
---
 gtk2_ardour/ardour_ui.cc       | 10 +++++-----
 gtk2_ardour/editor_mouse.cc    | 10 +++++-----
 gtk2_ardour/editor_ops.cc      |  2 +-
 gtk2_ardour/shuttle_control.cc |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 41987aa98a..fd8a57e8e5 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2013,13 +2013,13 @@ ARDOUR_UI::transport_ffwd_rewind (bool fwd)
 
 		if (fwd) {
 			if (transport_speed <= 0) {
-				_session->request_transport_speed (1.0, false);
+				_session->request_transport_speed (1.0);
 				_session->request_roll (TRS_UI);
 				return;
 			}
 		} else {
 			if (transport_speed >= 0) {
-				_session->request_transport_speed (-1.0, false);
+				_session->request_transport_speed (-1.0);
 				_session->request_roll (TRS_UI);
 				return;
 			}
@@ -2034,12 +2034,12 @@ ARDOUR_UI::transport_ffwd_rewind (bool fwd)
 
 			if (fwd) {
 				if (transport_speed <= 0) {
-					_session->request_transport_speed (1.0, false);
+					_session->request_transport_speed (1.0);
 					_session->request_roll (TRS_UI);
 				}
 			} else {
 				if (transport_speed >= 0) {
-					_session->request_transport_speed (-1.0, false);
+					_session->request_transport_speed (-1.0);
 					_session->request_roll (TRS_UI);
 				}
 			}
@@ -2086,7 +2086,7 @@ ARDOUR_UI::transport_ffwd_rewind (bool fwd)
 
 	speed = semitone_ratio * transport_speed;
 	speed = std::max (-maxspeed, std::min (maxspeed, speed));
-	_session->request_transport_speed (speed, false);
+	_session->request_transport_speed (speed);
 	_session->request_roll (TRS_UI);
 
 }
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index e5ac0cd529..162fed5e95 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -2115,7 +2115,7 @@ Editor::scrub (samplepos_t sample, double current_x)
 	if (scrubbing_direction == 0) {
 		/* first move */
 		_session->request_locate (sample, MustStop);
-		_session->request_transport_speed (0.1, false);
+		_session->request_transport_speed (0.1);
 		scrubbing_direction = 1;
 
 	} else {
@@ -2139,7 +2139,7 @@ Editor::scrub (samplepos_t sample, double current_x)
 				scrub_reverse_distance = 0;
 
 				delta = 0.01 * (last_scrub_x - current_x);
-				_session->request_transport_speed_nonzero (_session->actual_speed() - delta, false);
+				_session->request_transport_speed_nonzero (_session->actual_speed() - delta);
 			}
 
 		} else {
@@ -2158,7 +2158,7 @@ Editor::scrub (samplepos_t sample, double current_x)
 				scrub_reverse_distance = 0;
 
 				delta = 0.01 * (current_x - last_scrub_x);
-				_session->request_transport_speed_nonzero (_session->actual_speed() + delta, false);
+				_session->request_transport_speed_nonzero (_session->actual_speed() + delta);
 			}
 		}
 
@@ -2170,11 +2170,11 @@ Editor::scrub (samplepos_t sample, double current_x)
 
 			if (scrubbing_direction > 0) {
 				/* was forwards, go backwards */
-				_session->request_transport_speed (-0.1, false);
+				_session->request_transport_speed (-0.1);
 				scrubbing_direction = -1;
 			} else {
 				/* was backwards, go forwards */
-				_session->request_transport_speed (0.1, false);
+				_session->request_transport_speed (0.1);
 				scrubbing_direction = 1;
 			}
 
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index cf2d08c386..67b9bde53f 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -2673,7 +2673,7 @@ Editor::transition_to_rolling (bool fwd)
 		return;
 	}
 
-	_session->request_transport_speed (fwd ? 1.0f : -1.0f, false);
+	_session->request_transport_speed (fwd ? 1.0f : -1.0f);
 	_session->request_roll ();
 }
 
diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index 4e9f2aa2da..d0c10a8bf8 100644
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -545,9 +545,9 @@ ShuttleControl::use_shuttle_fract (bool force, bool zero_ok)
 
 	if (_session) {
 		if (zero_ok) {
-			_session->request_transport_speed (speed, Config->get_shuttle_behaviour() == Wheel);
+			_session->request_transport_speed (speed);
 		} else {
-			_session->request_transport_speed_nonzero (speed, Config->get_shuttle_behaviour() == Wheel);
+			_session->request_transport_speed_nonzero (speed);
 		}
 
 		if (speed != 0 && !_session->transport_state_rolling()) {