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

rearrange transportFSM code to be more explicit about a speed-reset-after-stop

Browse source
This commit is contained in:
Paul Davis 2021-05-08 17:30:01 -06:00
parent e588fe2057
commit ad14077587
2 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -216,6 +216,7 @@ struct TransportFSM
void set_roll_after (bool) const; void set_roll_after (bool) const;
bool compute_should_roll (LocateTransportDisposition) const; bool compute_should_roll (LocateTransportDisposition) const;
int compute_transport_speed () const; int compute_transport_speed () const;
void maybe_reset_speed ();
}; };
} /* end namespace ARDOUR */ } /* end namespace ARDOUR */

12
libs/ardour/transport_fsm.cc
View file

@ -427,6 +427,7 @@ TransportFSM::process_event (Event& ev, bool already_deferred, bool& deferred)
start_locate_after_declick (); start_locate_after_declick ();
break; break;
case DeclickToStop: case DeclickToStop:
maybe_reset_speed ();
transition (Stopped); transition (Stopped);
/* transport already stopped */ /* transport already stopped */
break; break;
@ -493,8 +494,12 @@ TransportFSM::stop_playback (Event const & s)
_last_locate.target = max_samplepos; _last_locate.target = max_samplepos;
current_roll_after_locate_status = boost::none; current_roll_after_locate_status = boost::none;
if (!declicking_for_locate()) { api->stop_transport (s.abort_capture, s.clear_state);
}
void
TransportFSM::maybe_reset_speed ()
{
if (Config->get_reset_default_speed_on_stop()) { if (Config->get_reset_default_speed_on_stop()) {
if (most_recently_requested_speed != 1.0) { if (most_recently_requested_speed != 1.0) {
@ -510,15 +515,10 @@ TransportFSM::stop_playback (Event const & s)
* the current _default_transport_speed * the current _default_transport_speed
*/ */
if (most_recently_requested_speed != _default_speed) { if (most_recently_requested_speed != _default_speed) {
set_speed (Event (_default_speed, false)); set_speed (Event (_default_speed, false));
} }
} }
}
api->stop_transport (s.abort_capture, s.clear_state);
} }
void void