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

Fix deflection of shuttle control 

See also 89a85da52c
 * Fix deflection when using percent (use sqrt/pow2)
 * Simplify linear deflection when using semitones
 * Allow deflection of > 200% when using semitones
This commit is contained in:
Robin Gareus 2022-06-05 23:23:18 +02:00
parent 75fe2ce095
commit f6c748537f
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 6 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gtk2_ardour/shuttle_control.cc
View File

@ -327,10 +327,7 @@ ShuttleControl::map_transport_state ()
shuttle_fract = 0;
} else {
if (Config->get_shuttle_units () == Semitones) {
bool reverse;
int semi = speed_as_semitones (speed, reverse);
semi = std::max (-24, std::min (24, semi));
shuttle_fract = semitones_as_fract (semi, reverse);
shuttle_fract = speed / shuttle_max_speed;
} else {
shuttle_fract = speed_as_fract (speed);
}
@ -566,40 +563,6 @@ ShuttleControl::speed_as_cents (float speed, bool& reverse)
}
}
float
ShuttleControl::cents_as_speed (int cents, bool reverse)
{
if (reverse) {
return -pow (2.0, (cents / 1200.0));
} else {
return pow (2.0, (cents / 1200.0));
}
}
float
ShuttleControl::semitones_as_speed (int semi, bool reverse)
{
if (reverse) {
return -pow (2.0, (semi / 12.0));
} else {
return pow (2.0, (semi / 12.0));
}
}
float
ShuttleControl::semitones_as_fract (int semi, bool reverse) const
{
return semitones_as_speed (semi, reverse) / shuttle_max_speed;
}
int
ShuttleControl::fract_as_semitones (float fract, bool& reverse) const
{
/* -1 <= fract <= 1 */
assert (fract != 0.0);
return speed_as_semitones (fract * shuttle_max_speed, reverse);
}
float
ShuttleControl::speed_as_fract (float speed) const
{
@ -640,16 +603,9 @@ ShuttleControl::use_shuttle_fract (bool force, bool zero_ok)
last_shuttle_request = now;
double speed = 0;
float warped_fract = shuttle_fract * shuttle_fract;
if (Config->get_shuttle_units () == Semitones) {
if (shuttle_fract != 0.0) {
bool reverse;
int semi = fract_as_semitones (shuttle_fract, reverse);
speed = semitones_as_speed (semi, reverse);
} else {
speed = 0.0;
}
speed = shuttle_fract * shuttle_max_speed;
} else {
speed = fract_as_speed (shuttle_fract);
}
@ -717,7 +673,8 @@ ShuttleControl::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangl
}
/* marker */
float visual_fraction = std::max (-1.0f, std::min (1.0f, speed / shuttle_max_speed));
float visual_fraction = std::max (-1.0f, std::min (1.0f, shuttle_fract));
float marker_size = round (get_height () * MARKER_SIZE);
float avail_width = get_width () - marker_size;
float x = 0.5 * (get_width () + visual_fraction * avail_width - marker_size);

10
gtk2_ardour/shuttle_control.h
View File

@ -101,17 +101,11 @@ public:
}
public:
int fract_as_semitones (float, bool&) const;
float semitones_as_fract (int, bool) const;
float speed_as_fract (float) const;
float fract_as_speed (float) const;
static int speed_as_semitones (float, bool&);
static float semitones_as_speed (int, bool);
static int speed_as_cents (float, bool&);
static float cents_as_speed (int, bool);
static int speed_as_semitones (float, bool&);
static int speed_as_cents (float, bool&);
protected:
bool _hovering;