From d31a7c292f555d3fc1f7e7efb12f178daaf1eff3 Mon Sep 17 00:00:00 2001
From: Ben Loftis <ben@harrisonconsoles.com>
Date: Fri, 18 Jun 2021 13:22:47 -0500
Subject: [PATCH] Default_Play_Speed: nuke shuttle Wheel mode (libardour part)

---
 libs/ardour/ardour/rc_configuration_vars.h | 1 -
 libs/ardour/ardour/session.h               | 1 +
 libs/ardour/ardour/types.h                 | 5 -----
 libs/ardour/ardour/types_convert.h         | 1 -
 libs/ardour/enums.cc                       | 5 -----
 libs/ardour/luabindings.cc                 | 5 -----
 libs/ardour/session_transport.cc           | 6 ++++++
 7 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index 62413274d0..cd185534af 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -174,7 +174,6 @@ CONFIG_VARIABLE (samplecnt_t, preroll, "preroll", 0)
 CONFIG_VARIABLE (samplecnt_t, postroll, "postroll", 0)
 CONFIG_VARIABLE (float, shuttle_speed_factor, "shuttle-speed-factor", 1.0f) // used for MMC shuttle
 CONFIG_VARIABLE (float, shuttle_speed_threshold, "shuttle-speed-threshold", 5.0f) // used for MMC shuttle
-CONFIG_VARIABLE (ShuttleBehaviour, shuttle_behaviour, "shuttle-behaviour", Wheel)
 CONFIG_VARIABLE (ShuttleUnits, shuttle_units, "shuttle-units", Percentage)
 CONFIG_VARIABLE (float, shuttle_max_speed, "shuttle-max-speed", 8.0f)
 CONFIG_VARIABLE (bool, locate_while_waiting_for_sync, "locate-while-waiting-for-sync", false)
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 59b506be12..933b38ed85 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -479,6 +479,7 @@ public:
 	void use_rf_shuttle_speed ();
 	void allow_auto_play (bool yn);
 
+	double default_play_speed ();
 	void set_default_play_speed (double spd, TransportRequestSource origin = TRS_UI);
 	void reset_transport_speed (TransportRequestSource origin = TRS_UI);
 
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 11d784079d..db034c1a14 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -626,11 +626,6 @@ enum TransportRequestType {
 	TR_Locate    = 0x4
 };
 
-enum ShuttleBehaviour {
-	Sprung,
-	Wheel
-};
-
 enum ShuttleUnits {
 	Percentage,
 	Semitones
diff --git a/libs/ardour/ardour/types_convert.h b/libs/ardour/ardour/types_convert.h
index 3e0ee20991..0afde93aa9 100644
--- a/libs/ardour/ardour/types_convert.h
+++ b/libs/ardour/ardour/types_convert.h
@@ -48,7 +48,6 @@ DEFINE_ENUM_CONVERT(ARDOUR::ListenPosition)
 DEFINE_ENUM_CONVERT(ARDOUR::LayerModel)
 DEFINE_ENUM_CONVERT(ARDOUR::InsertMergePolicy)
 DEFINE_ENUM_CONVERT(ARDOUR::SyncSource)
-DEFINE_ENUM_CONVERT(ARDOUR::ShuttleBehaviour)
 DEFINE_ENUM_CONVERT(ARDOUR::ShuttleUnits)
 DEFINE_ENUM_CONVERT(ARDOUR::ClockDeltaMode)
 DEFINE_ENUM_CONVERT(ARDOUR::DenormalModel)
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index a8b248b7de..e74a133bf5 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -99,7 +99,6 @@ setup_enum_writer ()
 	PluginType _PluginType;
 	SyncSource _SyncSource;
 	TransportRequestType _TransportRequestType;
-	ShuttleBehaviour _ShuttleBehaviour;
 	ShuttleUnits _ShuttleUnits;
 	Session::RecordState _Session_RecordState;
 	SessionEvent::Type _SessionEvent_Type;
@@ -434,10 +433,6 @@ setup_enum_writer ()
 	REGISTER_ENUM (TR_Locate);
 	REGISTER (_TransportRequestType);
 
-	REGISTER_ENUM (Sprung);
-	REGISTER_ENUM (Wheel);
-	REGISTER (_ShuttleBehaviour);
-
 	REGISTER_ENUM (Percentage);
 	REGISTER_ENUM (Semitones);
 	REGISTER (_ShuttleUnits);
diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc
index f2d3d6647c..5c7d7ef29a 100644
--- a/libs/ardour/luabindings.cc
+++ b/libs/ardour/luabindings.cc
@@ -2274,11 +2274,6 @@ LuaBindings::common (lua_State* L)
 		.addConst ("ForceSel", ARDOUR::RangeSelectionAfterSplit(ForceSel))
 		.endNamespace ()
 
-		.beginNamespace ("ShuttleBehaviour")
-		.addConst ("Sprung", ARDOUR::ShuttleBehaviour(Sprung))
-		.addConst ("Wheel", ARDOUR::ShuttleBehaviour(Wheel))
-		.endNamespace ()
-
 		.beginNamespace ("ScreenSaverMode")
 		.addConst ("InhibitNever", ARDOUR::ScreenSaverMode(InhibitNever))
 		.addConst ("InhibitWhileRecording", ARDOUR::ScreenSaverMode(InhibitWhileRecording))
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 8cc5d90d35..d4286c0fb1 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -309,6 +309,12 @@ Session::post_locate ()
 	}
 }
 
+double
+Session::default_play_speed ()
+{
+	return _transport_fsm->default_speed();
+}
+
 /** Set the default speed that is used when we respond to a "play" action.
  *  @param speed New speed
  */