alex/nih-plug
1
0
Fork 0
Code Activity

Fix note formatter octave conversion, again

Browse source
This commit is contained in:
Robbert van der Helm 2023-01-10 14:03:17 +01:00
parent 2aa937e370
commit 838e1bfd2d
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/formatters.rs
View file

@ -155,10 +155,9 @@ pub fn v2s_f32_hz_then_khz_with_note_name(
let cents = ((fractional_note - note) * 100.0).round() as i32; let cents = ((fractional_note - note) * 100.0).round() as i32;
let note_name = util::NOTES[(note as i32).rem_euclid(12) as usize]; let note_name = util::NOTES[(note as i32).rem_euclid(12) as usize];
// NOTE: This is different compared from `(note as i32 / 12) - 1` because of the signed 0 in // NOTE: This is different compared from `(note as i32 / 12) - 1` because truncating always
// floating point numbers. The signed zero makes sure this works correctly for the // rounds towards zero
// first negative octave number. let octave = (note / 12.0).floor() as i32 - 1;
let octave = (note / 12.0).round() as i32 - 1;
let note_str = if cents == 0 || !include_cents { let note_str = if cents == 0 || !include_cents {
format!("{note_name}{octave}") format!("{note_name}{octave}")
} else { } else {
@ -329,7 +328,7 @@ mod tests {
let v2s = v2s_f32_hz_then_khz_with_note_name(1, true); let v2s = v2s_f32_hz_then_khz_with_note_name(1, true);
let s2v = s2v_f32_hz_then_khz(); let s2v = s2v_f32_hz_then_khz();
for freq in [0.0, 5.0, 69.420, 18181.8, 133333.7] { for freq in [0.0, 5.0, 7.18, 8.18, 69.420, 18181.8, 133333.7] {
let string = v2s(freq); let string = v2s(freq);
// We can't compare `freq` and `roundtrip_freq` because the string is rounded on both // We can't compare `freq` and `roundtrip_freq` because the string is rounded on both
// cents and frequency and is thus lossy // cents and frequency and is thus lossy