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/surfaces | |
parent | 3c00048b0c0dbf3efd17cf04fdc7daa91424e338 (diff) |
rename DoTheRightThing to RollIfAppropriate
Diffstat (limited to 'libs/surfaces')
-rw-r--r-- | libs/surfaces/contourdesign/contourdesign.cc | 6 | ||||
-rw-r--r-- | libs/surfaces/control_protocol/basic_ui.cc | 8 | ||||
-rw-r--r-- | libs/surfaces/control_protocol/control_protocol/basic_ui.h | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libs/surfaces/contourdesign/contourdesign.cc b/libs/surfaces/contourdesign/contourdesign.cc index 0ddf9c5945..cceb605104 100644 --- a/libs/surfaces/contourdesign/contourdesign.cc +++ b/libs/surfaces/contourdesign/contourdesign.cc @@ -557,7 +557,7 @@ ContourDesignControlProtocol::prev_marker_keep_rolling () samplepos_t pos = session->locations()->first_mark_before (session->transport_sample()); if (pos >= 0) { - session->request_locate (pos, DoTheRightThing); + session->request_locate (pos, RollIfAppropriate); } else { session->goto_start (); } @@ -569,7 +569,7 @@ ContourDesignControlProtocol::next_marker_keep_rolling () samplepos_t pos = session->locations()->first_mark_after (session->transport_sample()); if (pos >= 0) { - session->request_locate (pos, DoTheRightThing); + session->request_locate (pos, RollIfAppropriate); } else { session->goto_end(); } @@ -592,7 +592,7 @@ ContourDesignControlProtocol::jog_event_forward () void ContourDesignControlProtocol::jump_forward (JumpDistance dist) { - LocateTransportDisposition kr = _keep_rolling ? DoTheRightThing : MustStop; + LocateTransportDisposition kr = _keep_rolling ? RollIfAppropriate : MustStop; switch (dist.unit) { case SECONDS: jump_by_seconds (dist.value, kr); break; case BEATS: jump_by_beats (dist.value, kr); break; diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc index 5c2879cdf0..73f0792826 100644 --- a/libs/surfaces/control_protocol/basic_ui.cc +++ b/libs/surfaces/control_protocol/basic_ui.cc @@ -330,7 +330,7 @@ BasicUI::prev_marker () samplepos_t pos = session->locations()->first_mark_before (session->transport_sample()); if (pos >= 0) { - session->request_locate (pos, DoTheRightThing); + session->request_locate (pos, RollIfAppropriate); } else { session->goto_start (); } @@ -342,7 +342,7 @@ BasicUI::next_marker () samplepos_t pos = session->locations()->first_mark_after (session->transport_sample()); if (pos >= 0) { - session->request_locate (pos, DoTheRightThing); + session->request_locate (pos, RollIfAppropriate); } else { session->goto_end(); } @@ -425,7 +425,7 @@ BasicUI::locate (samplepos_t where, LocateTransportDisposition ltd) void BasicUI::locate (samplepos_t where, bool roll) { - session->request_locate (where, roll ? MustRoll : DoTheRightThing); + session->request_locate (where, roll ? MustRoll : RollIfAppropriate); } void @@ -695,7 +695,7 @@ BasicUI::goto_nth_marker (int n) for (Locations::LocationList::iterator i = ordered.begin(); n >= 0 && i != ordered.end(); ++i) { if ((*i)->is_mark() && !(*i)->is_hidden() && !(*i)->is_session_range()) { if (n == 0) { - session->request_locate ((*i)->start(), DoTheRightThing); + session->request_locate ((*i)->start(), RollIfAppropriate); break; } --n; diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h index 70f40f97b8..7d5904544f 100644 --- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h +++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h @@ -70,9 +70,9 @@ class LIBCONTROLCP_API BasicUI { void set_transport_speed (double speed); double get_transport_speed (); - void jump_by_seconds (double sec, ARDOUR::LocateTransportDisposition ltd = ARDOUR::DoTheRightThing); - void jump_by_bars (double bars, ARDOUR::LocateTransportDisposition ltd = ARDOUR::DoTheRightThing); - void jump_by_beats (double beats, ARDOUR::LocateTransportDisposition ltd = ARDOUR::DoTheRightThing); + void jump_by_seconds (double sec, ARDOUR::LocateTransportDisposition ltd = ARDOUR::RollIfAppropriate); + void jump_by_bars (double bars, ARDOUR::LocateTransportDisposition ltd = ARDOUR::RollIfAppropriate); + void jump_by_beats (double beats, ARDOUR::LocateTransportDisposition ltd = ARDOUR::RollIfAppropriate); ARDOUR::samplepos_t transport_sample (); void locate (ARDOUR::samplepos_t sample, ARDOUR::LocateTransportDisposition ltd); |