ardour/livetrax
13
0
Fork 0
Code

Default_Play_Speed: prep work (gtk2)

Browse Source 
* request_transport_speed should -never- set default_play_speed
This commit is contained in:
Ben Loftis 2021-06-18 12:22:59 -05:00
parent 006055a2ff
commit b4eba1a30b
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/ardour_ui.cc
View File

@ -2013,13 +2013,13 @@ ARDOUR_UI::transport_ffwd_rewind (bool fwd)
if (fwd) { if (fwd) {
if (transport_speed <= 0) { if (transport_speed <= 0) {
_session->request_transport_speed (1.0, false); _session->request_transport_speed (1.0);
_session->request_roll (TRS_UI); _session->request_roll (TRS_UI);
return; return;
} }
} else { } else {
if (transport_speed >= 0) { if (transport_speed >= 0) {
_session->request_transport_speed (-1.0, false); _session->request_transport_speed (-1.0);
_session->request_roll (TRS_UI); _session->request_roll (TRS_UI);
return; return;
} }
@ -2034,12 +2034,12 @@ ARDOUR_UI::transport_ffwd_rewind (bool fwd)
if (fwd) { if (fwd) {
if (transport_speed <= 0) { if (transport_speed <= 0) {
_session->request_transport_speed (1.0, false); _session->request_transport_speed (1.0);
_session->request_roll (TRS_UI); _session->request_roll (TRS_UI);
} }
} else { } else {
if (transport_speed >= 0) { if (transport_speed >= 0) {
_session->request_transport_speed (-1.0, false); _session->request_transport_speed (-1.0);
_session->request_roll (TRS_UI); _session->request_roll (TRS_UI);
} }
} }
@ -2086,7 +2086,7 @@ ARDOUR_UI::transport_ffwd_rewind (bool fwd)
speed = semitone_ratio * transport_speed; speed = semitone_ratio * transport_speed;
speed = std::max (-maxspeed, std::min (maxspeed, speed)); speed = std::max (-maxspeed, std::min (maxspeed, speed));
_session->request_transport_speed (speed, false); _session->request_transport_speed (speed);
_session->request_roll (TRS_UI); _session->request_roll (TRS_UI);
} }

10
gtk2_ardour/editor_mouse.cc
View File

@ -2115,7 +2115,7 @@ Editor::scrub (samplepos_t sample, double current_x)
if (scrubbing_direction == 0) { if (scrubbing_direction == 0) {
/* first move */ /* first move */
_session->request_locate (sample, MustStop); _session->request_locate (sample, MustStop);
_session->request_transport_speed (0.1, false); _session->request_transport_speed (0.1);
scrubbing_direction = 1; scrubbing_direction = 1;
} else { } else {
@ -2139,7 +2139,7 @@ Editor::scrub (samplepos_t sample, double current_x)
scrub_reverse_distance = 0; scrub_reverse_distance = 0;
delta = 0.01 * (last_scrub_x - current_x); delta = 0.01 * (last_scrub_x - current_x);
_session->request_transport_speed_nonzero (_session->actual_speed() - delta, false); _session->request_transport_speed_nonzero (_session->actual_speed() - delta);
} }
} else { } else {
@ -2158,7 +2158,7 @@ Editor::scrub (samplepos_t sample, double current_x)
scrub_reverse_distance = 0; scrub_reverse_distance = 0;
delta = 0.01 * (current_x - last_scrub_x); delta = 0.01 * (current_x - last_scrub_x);
_session->request_transport_speed_nonzero (_session->actual_speed() + delta, false); _session->request_transport_speed_nonzero (_session->actual_speed() + delta);
} }
} }
@ -2170,11 +2170,11 @@ Editor::scrub (samplepos_t sample, double current_x)
if (scrubbing_direction > 0) { if (scrubbing_direction > 0) {
/* was forwards, go backwards */ /* was forwards, go backwards */
_session->request_transport_speed (-0.1, false); _session->request_transport_speed (-0.1);
scrubbing_direction = -1; scrubbing_direction = -1;
} else { } else {
/* was backwards, go forwards */ /* was backwards, go forwards */
_session->request_transport_speed (0.1, false); _session->request_transport_speed (0.1);
scrubbing_direction = 1; scrubbing_direction = 1;
} }

2
gtk2_ardour/editor_ops.cc
View File

@ -2673,7 +2673,7 @@ Editor::transition_to_rolling (bool fwd)
return; return;
} }
_session->request_transport_speed (fwd ? 1.0f : -1.0f, false); _session->request_transport_speed (fwd ? 1.0f : -1.0f);
_session->request_roll (); _session->request_roll ();
} }

4
gtk2_ardour/shuttle_control.cc
View File

@ -545,9 +545,9 @@ ShuttleControl::use_shuttle_fract (bool force, bool zero_ok)
if (_session) { if (_session) {
if (zero_ok) { if (zero_ok) {
_session->request_transport_speed (speed, Config->get_shuttle_behaviour() == Wheel); _session->request_transport_speed (speed);
} else { } else {
_session->request_transport_speed_nonzero (speed, Config->get_shuttle_behaviour() == Wheel); _session->request_transport_speed_nonzero (speed);
} }
if (speed != 0 && !_session->transport_state_rolling()) { if (speed != 0 && !_session->transport_state_rolling()) {