diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2020-01-17 15:26:01 -0700 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2020-01-18 08:49:18 -0700 |
| commit | 3c00048b0c0dbf3efd17cf04fdc7daa91424e338 (patch) | |
| tree | 7049bed10f750ba08a0e4769f975a90930dab5db /gtk2_ardour/ardour_ui.cc | |
| parent | 3fe87b9fa1417cfcf6636ff9bf4c8c2abcb6f796 (diff) | |
Session::request_locate() takes a tri-valued second argument for "roll-after-locate"
This allows callers to defer logic about auto-play/current rolling state and more to TransportFSM where it
can be cnentralized and is less ambiguous
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 83609a6d70..c604d0c508 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1611,7 +1611,7 @@ ARDOUR_UI::transport_goto_wallclock () samples += tmnow.tm_min * (60 * sample_rate); samples += tmnow.tm_sec * sample_rate; - _session->request_locate (samples, _session->transport_rolling ()); + _session->request_locate (samples, DoTheRightThing); /* force displayed area in editor to start no matter what "follow playhead" setting is. @@ -1829,7 +1829,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode) } if (_session->get_play_loop() && Config->get_loop_is_mode()) { - _session->request_locate (_session->locations()->auto_loop_location()->start(), true); + _session->request_locate (_session->locations()->auto_loop_location()->start(), MustRoll); } else { if (UIConfiguration::instance().get_follow_edits()) { list<AudioRange>& range = editor->get_selection().time; |