diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2020-01-17 16:35:28 -0700 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2020-01-18 08:49:18 -0700 |
| commit | 47767738b9aee165a03f09f8ba222179bb73aeb6 (patch) | |
| tree | e4a6c3fbfc31c18fa430be8c7deb125377cecf75 /libs/ardour | |
| parent | 3c00048b0c0dbf3efd17cf04fdc7daa91424e338 (diff) | |
rename DoTheRightThing to RollIfAppropriate
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/types.h | 2 | ||||
| -rw-r--r-- | libs/ardour/enums.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/session_transport.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/transport_fsm.cc | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 402c55bf59..5ce59bc174 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -444,7 +444,7 @@ public: void request_roll_at_and_return (samplepos_t start, samplepos_t return_to); void request_bounded_roll (samplepos_t start, samplepos_t end); void request_stop (bool abort = false, bool clear_state = false, TransportRequestSource origin = TRS_UI); - void request_locate (samplepos_t sample, LocateTransportDisposition ltd = DoTheRightThing, TransportRequestSource origin = TRS_UI); + void request_locate (samplepos_t sample, LocateTransportDisposition ltd = RollIfAppropriate, TransportRequestSource origin = TRS_UI); void request_play_loop (bool yn, bool leave_rolling = false); bool get_play_loop () const { return play_loop; } diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 1504698896..3db1a34dc9 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -802,7 +802,7 @@ enum OverwriteReason { enum LocateTransportDisposition { MustRoll, MustStop, - DoTheRightThing + RollIfAppropriate }; typedef std::vector<CaptureInfo*> CaptureInfos; diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index d8a442150c..69bbb0bb61 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -837,7 +837,7 @@ setup_enum_writer () REGISTER_ENUM (MustStop); REGISTER_ENUM (MustRoll); - REGISTER_ENUM (DoTheRightThing); + REGISTER_ENUM (RollIfAppropriate); REGISTER (_LocateTransportDisposition); } diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 454a9065ed..6b988be098 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -6093,9 +6093,9 @@ void Session::goto_start (bool and_roll) { if (_session_range_location) { - request_locate (_session_range_location->start(), and_roll ? MustRoll : DoTheRightThing); + request_locate (_session_range_location->start(), and_roll ? MustRoll : RollIfAppropriate); } else { - request_locate (0, and_roll ? MustRoll : DoTheRightThing); + request_locate (0, and_roll ? MustRoll : RollIfAppropriate); } } diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 9e5117f9d1..2b630aa939 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -930,7 +930,7 @@ Session::request_locate (samplepos_t target_sample, LocateTransportDisposition l case MustStop: type = SessionEvent::Locate; break; - case DoTheRightThing: + case RollIfAppropriate: if (config.get_auto_play()) { type = SessionEvent::LocateRoll; } else { diff --git a/libs/ardour/transport_fsm.cc b/libs/ardour/transport_fsm.cc index a06e2159c9..05d4757e95 100644 --- a/libs/ardour/transport_fsm.cc +++ b/libs/ardour/transport_fsm.cc @@ -418,7 +418,7 @@ TransportFSM::compute_should_roll (LocateTransportDisposition ltd) const return true; case MustStop: return false; - case DoTheRightThing: + case RollIfAppropriate: if (rolling()) { return true; } else { |