smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 12:16:30 +01:00
Code Issues Projects Releases Wiki Activity

Default_Play_Speed: nuke shuttle Wheel mode (libardour part)

Browse source
This commit is contained in:
Ben Loftis 2021-06-18 13:22:47 -05:00
parent b4eba1a30b
commit d31a7c292f
7 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/ardour/ardour/rc_configuration_vars.h
View file

@ -174,7 +174,6 @@ CONFIG_VARIABLE (samplecnt_t, preroll, "preroll", 0)
CONFIG_VARIABLE (samplecnt_t, postroll, "postroll", 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_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 (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 (ShuttleUnits, shuttle_units, "shuttle-units", Percentage)
CONFIG_VARIABLE (float, shuttle_max_speed, "shuttle-max-speed", 8.0f) 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) CONFIG_VARIABLE (bool, locate_while_waiting_for_sync, "locate-while-waiting-for-sync", false)

1
libs/ardour/ardour/session.h
View file

@ -479,6 +479,7 @@ public:
void use_rf_shuttle_speed (); void use_rf_shuttle_speed ();
void allow_auto_play (bool yn); void allow_auto_play (bool yn);
double default_play_speed ();
void set_default_play_speed (double spd, TransportRequestSource origin = TRS_UI); void set_default_play_speed (double spd, TransportRequestSource origin = TRS_UI);
void reset_transport_speed (TransportRequestSource origin = TRS_UI); void reset_transport_speed (TransportRequestSource origin = TRS_UI);

5
libs/ardour/ardour/types.h
View file

@ -626,11 +626,6 @@ enum TransportRequestType {
TR_Locate = 0x4 TR_Locate = 0x4
}; };
enum ShuttleBehaviour {
Sprung,
Wheel
};
enum ShuttleUnits { enum ShuttleUnits {
Percentage, Percentage,
Semitones Semitones

1
libs/ardour/ardour/types_convert.h
View file

@ -48,7 +48,6 @@ DEFINE_ENUM_CONVERT(ARDOUR::ListenPosition)
DEFINE_ENUM_CONVERT(ARDOUR::LayerModel) DEFINE_ENUM_CONVERT(ARDOUR::LayerModel)
DEFINE_ENUM_CONVERT(ARDOUR::InsertMergePolicy) DEFINE_ENUM_CONVERT(ARDOUR::InsertMergePolicy)
DEFINE_ENUM_CONVERT(ARDOUR::SyncSource) DEFINE_ENUM_CONVERT(ARDOUR::SyncSource)
DEFINE_ENUM_CONVERT(ARDOUR::ShuttleBehaviour)
DEFINE_ENUM_CONVERT(ARDOUR::ShuttleUnits) DEFINE_ENUM_CONVERT(ARDOUR::ShuttleUnits)
DEFINE_ENUM_CONVERT(ARDOUR::ClockDeltaMode) DEFINE_ENUM_CONVERT(ARDOUR::ClockDeltaMode)
DEFINE_ENUM_CONVERT(ARDOUR::DenormalModel) DEFINE_ENUM_CONVERT(ARDOUR::DenormalModel)

5
libs/ardour/enums.cc
View file

@ -99,7 +99,6 @@ setup_enum_writer ()
PluginType _PluginType; PluginType _PluginType;
SyncSource _SyncSource; SyncSource _SyncSource;
TransportRequestType _TransportRequestType; TransportRequestType _TransportRequestType;
ShuttleBehaviour _ShuttleBehaviour;
ShuttleUnits _ShuttleUnits; ShuttleUnits _ShuttleUnits;
Session::RecordState _Session_RecordState; Session::RecordState _Session_RecordState;
SessionEvent::Type _SessionEvent_Type; SessionEvent::Type _SessionEvent_Type;
@ -434,10 +433,6 @@ setup_enum_writer ()
REGISTER_ENUM (TR_Locate); REGISTER_ENUM (TR_Locate);
REGISTER (_TransportRequestType); REGISTER (_TransportRequestType);
REGISTER_ENUM (Sprung);
REGISTER_ENUM (Wheel);
REGISTER (_ShuttleBehaviour);
REGISTER_ENUM (Percentage); REGISTER_ENUM (Percentage);
REGISTER_ENUM (Semitones); REGISTER_ENUM (Semitones);
REGISTER (_ShuttleUnits); REGISTER (_ShuttleUnits);

5
libs/ardour/luabindings.cc
View file

@ -2274,11 +2274,6 @@ LuaBindings::common (lua_State* L)
.addConst ("ForceSel", ARDOUR::RangeSelectionAfterSplit(ForceSel)) .addConst ("ForceSel", ARDOUR::RangeSelectionAfterSplit(ForceSel))
.endNamespace () .endNamespace ()
.beginNamespace ("ShuttleBehaviour")
.addConst ("Sprung", ARDOUR::ShuttleBehaviour(Sprung))
.addConst ("Wheel", ARDOUR::ShuttleBehaviour(Wheel))
.endNamespace ()
.beginNamespace ("ScreenSaverMode") .beginNamespace ("ScreenSaverMode")
.addConst ("InhibitNever", ARDOUR::ScreenSaverMode(InhibitNever)) .addConst ("InhibitNever", ARDOUR::ScreenSaverMode(InhibitNever))
.addConst ("InhibitWhileRecording", ARDOUR::ScreenSaverMode(InhibitWhileRecording)) .addConst ("InhibitWhileRecording", ARDOUR::ScreenSaverMode(InhibitWhileRecording))

6
libs/ardour/session_transport.cc
View file

@ -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. /** Set the default speed that is used when we respond to a "play" action.
* @param speed New speed * @param speed New speed
*/ */