tuxmain/HexoDSP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

round instead of flooring cents

Browse source
This commit is contained in:
Weird Constructor 2021-06-06 13:33:41 +02:00
parent 12c8362465
commit 1d5ea0599e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dsp/mod.rs
View file

@ -257,9 +257,9 @@ macro_rules! n_det { ($x: expr) => { $x / 120.0 } }
macro_rules! d_det { ($x: expr) => { $x * 120.0 } } macro_rules! d_det { ($x: expr) => { $x * 120.0 } }
macro_rules! r_det { ($x: expr, $coarse: expr) => { macro_rules! r_det { ($x: expr, $coarse: expr) => {
if $coarse { if $coarse {
n_det!((d_det!($x)).floor()) n_det!((d_det!($x)).round())
} else { } else {
n_det!((d_det!($x) * 10.0).floor() / 10.0) n_det!((d_det!($x) * 10.0).round() / 10.0)
} }
} } } }
@ -285,7 +285,7 @@ macro_rules! f_det { ($formatter: expr, $v: expr, $denorm_v: expr) => {
{ {
let sign = if $denorm_v < 0.0 { -1.0 } else { 1.0 }; let sign = if $denorm_v < 0.0 { -1.0 } else { 1.0 };
let semitones = $denorm_v.floor().abs(); let semitones = $denorm_v.floor().abs();
let cents = ($denorm_v.fract() * 100.0).floor().abs(); let cents = ($denorm_v.fract() * 100.0).round().abs();
if (cents > 1.0) { if (cents > 1.0) {
write!($formatter, "{:2.0}s {:3.0}c", sign * semitones, cents) write!($formatter, "{:2.0}s {:3.0}c", sign * semitones, cents)