alex/nih-plug
1
0
Fork 0
Code Activity

Move frequency to note number conversion to utils

Browse source
This commit is contained in:
Robbert van der Helm 2022-11-18 16:09:18 +01:00
parent e5211ced4c
commit 6d0c1eebbe
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/formatters.rs
View file

@ -143,7 +143,7 @@ pub fn v2s_f32_hz_then_khz_with_note_name(
) -> Arc<dyn Fn(f32) -> String + Send + Sync> { ) -> Arc<dyn Fn(f32) -> String + Send + Sync> {
Arc::new(move |value| { Arc::new(move |value| {
// This is the inverse of the formula in `f32_midi_note_to_freq` // This is the inverse of the formula in `f32_midi_note_to_freq`
let fractional_note = ((value / 440.0).log2() * 12.0) + 69.0; let fractional_note = util::freq_to_midi_note(value);
let note = fractional_note.round(); let note = fractional_note.round();
let cents = ((fractional_note - note) * 100.0) as i32; let cents = ((fractional_note - note) * 100.0) as i32;

7
src/util.rs
View file

@ -57,6 +57,13 @@ pub fn f32_midi_note_to_freq(note: f32) -> f32 {
2.0f32.powf((note - 69.0) / 12.0) * 440.0 2.0f32.powf((note - 69.0) / 12.0) * 440.0
} }
/// The inverse of [`f32_midi_note_to_freq()`]. This returns a fractional note number. Round to a
/// whole number, subtract that from the result, and multiply the fractional part by 100 to get the
/// number of cents.
pub fn freq_to_midi_note(freq: f32) -> f32 {
((freq / 440.0).log2() * 12.0) + 69.0
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;