Default_Play_Speed: nuke shuttle Wheel mode (libardour part)
This commit is contained in:
parent
b4eba1a30b
commit
d31a7c292f
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -626,11 +626,6 @@ enum TransportRequestType {
|
|||
TR_Locate = 0x4
|
||||
};
|
||||
|
||||
enum ShuttleBehaviour {
|
||||
Sprung,
|
||||
Wheel
|
||||
};
|
||||
|
||||
enum ShuttleUnits {
|
||||
Percentage,
|
||||
Semitones
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue
Block a user