ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Honour forward/rewind option when already rolling #8031

Browse Source 
The options ForwardSlow, Forward and ForwardFast and their
respective Rewind options were not honoured in the execution
of forward/rewind operations when the transport was already
rolling at a slower speed than the forward or rewind option's
speed with same direction as the requested direction.
This commit is contained in:
Mister Benjamin 2020-04-22 10:50:43 +02:00 committed by Paul Davis
parent 54bc1018d5
commit 46fca9062d
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gtk2_ardour/ardour_ui.cc
View File

@ -1981,23 +1981,24 @@ ARDOUR_UI::transport_ffwd_rewind (int option, int dir)
* (-1, 0, 1) to get directional value
*/
const float current_transport_speed = _session->engine_speed () * _session->transport_speed();
float target_speed;
const float current_transport_speed = _session->engine_speed () * _session->transport_speed ();
float target_speed = current_transport_speed;
if ((dir < 0 && current_transport_speed >= 0.0f) || (dir > 0 && current_transport_speed <= 0.0f)) {
switch (option) {
case 0:
target_speed = dir * 1.0f;
break;
case 1:
target_speed = dir * 4.0f;
break;
case -1:
target_speed = dir * 0.5f;
break;
}
} else {
/* speed up */
switch (option) {
case 0:
target_speed = dir * 1.0f;
break;
case 1:
target_speed = dir * 4.0f;
break;
case -1:
target_speed = dir * 0.5f;
break;
}
bool speed_up = (dir > 0 && current_transport_speed >= target_speed);
speed_up = speed_up || (dir < 0 && current_transport_speed <= target_speed);
if (speed_up) {
target_speed = current_transport_speed * 1.5f;
}