summaryrefslogtreecommitdiff
path: root/libs/ardour/session.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2020-01-17 15:26:01 -0700
committerPaul Davis <paul@linuxaudiosystems.com>2020-01-18 08:49:18 -0700
commit3c00048b0c0dbf3efd17cf04fdc7daa91424e338 (patch)
tree7049bed10f750ba08a0e4769f975a90930dab5db /libs/ardour/session.cc
parent3fe87b9fa1417cfcf6636ff9bf4c8c2abcb6f796 (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 'libs/ardour/session.cc')
-rw-r--r--libs/ardour/session.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 62660c9fa2..454a9065ed 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1443,7 +1443,7 @@ Session::auto_loop_changed (Location* location)
*/
loop_changing = true;
- request_locate (location->start(), true);
+ request_locate (location->start(), MustRoll);
} else {
@@ -6083,9 +6083,9 @@ void
Session::goto_end ()
{
if (_session_range_location) {
- request_locate (_session_range_location->end(), false);
+ request_locate (_session_range_location->end(), MustStop);
} else {
- request_locate (0, false);
+ request_locate (0, MustStop);
}
}
@@ -6093,9 +6093,9 @@ void
Session::goto_start (bool and_roll)
{
if (_session_range_location) {
- request_locate (_session_range_location->start(), and_roll);
+ request_locate (_session_range_location->start(), and_roll ? MustRoll : DoTheRightThing);
} else {
- request_locate (0, and_roll);
+ request_locate (0, and_roll ? MustRoll : DoTheRightThing);
}
}