From 4f13ec69c199766db4e0e52d42b4c5d963f9bfac Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 4 May 2021 18:53:57 -0600 Subject: [PATCH] expose TransportFSM default_speed --- libs/ardour/ardour/transport_fsm.h | 3 ++- libs/ardour/transport_fsm.cc | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/ardour/ardour/transport_fsm.h b/libs/ardour/ardour/transport_fsm.h index 7912d7ad58..b57a691032 100644 --- a/libs/ardour/ardour/transport_fsm.h +++ b/libs/ardour/ardour/transport_fsm.h @@ -148,6 +148,7 @@ struct TransportFSM std::string current_state () const; double transport_speed() const { return _transport_speed; } + double default_speed() const { return _default_speed; } private: MotionState _motion_state; @@ -208,7 +209,7 @@ struct TransportFSM int processing; mutable boost::optional current_roll_after_locate_status; mutable double most_recently_requested_speed; - mutable double default_speed; + mutable double _default_speed; void defer (Event& ev); void bad_transition (Event const &); diff --git a/libs/ardour/transport_fsm.cc b/libs/ardour/transport_fsm.cc index 3e4c155af5..631320328d 100644 --- a/libs/ardour/transport_fsm.cc +++ b/libs/ardour/transport_fsm.cc @@ -87,7 +87,7 @@ TransportFSM::TransportFSM (TransportAPI& tapi) , api (&tapi) , processing (0) , most_recently_requested_speed (std::numeric_limits::max()) - , default_speed (1.0) + , _default_speed (1.0) { init (); } @@ -507,8 +507,8 @@ TransportFSM::stop_playback (Event const & s) */ - if (most_recently_requested_speed != default_speed) { - set_speed (Event (default_speed, false)); + if (most_recently_requested_speed != _default_speed) { + set_speed (Event (_default_speed, false)); } } @@ -599,7 +599,7 @@ TransportFSM::start_locate_after_declick () double post_locate_speed; if (api->user_roll_after_locate()) { - post_locate_speed = default_speed; + post_locate_speed = _default_speed; } else { post_locate_speed = most_recently_requested_speed; } @@ -788,7 +788,7 @@ TransportFSM::set_speed (Event const & ev) most_recently_requested_speed = ev.speed; if (ev.as_default) { - default_speed = ev.speed; + _default_speed = ev.speed; } if (must_reverse) {