From d6e399973e9bc6447a28b80cacffcbc6a768f1ed Mon Sep 17 00:00:00 2001 From: thajohns Date: Thu, 9 Sep 2021 01:15:22 -0400 Subject: got pre-linking steps working, removed glob includes --- src/types.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/types.rs') diff --git a/src/types.rs b/src/types.rs index b54eb42..ddef51e 100644 --- a/src/types.rs +++ b/src/types.rs @@ -10,18 +10,20 @@ impl Pitch { pub fn to_midi(&self) -> f32 { match *self { Pitch::MIDI(x) => x, - Pitch::Freq(x) => - 12.0 * (x / 440.0).log2() + 69.0, + Pitch::Freq(x) => 12.0 * (x / 440.0).log2() + 69.0, } } - pub fn to_midi_pitch(&self) -> Pitch { Pitch::MIDI(self.to_midi()) } + pub fn to_midi_pitch(&self) -> Pitch { + Pitch::MIDI(self.to_midi()) + } pub fn to_freq(&self) -> f32 { match *self { - Pitch::MIDI(x) => - 440.0 * (2.0f32).powf((x - 69.0) / 12.0), + Pitch::MIDI(x) => 440.0 * (2.0f32).powf((x - 69.0) / 12.0), Pitch::Freq(x) => x, } } - pub fn to_freq_pitch(&self) -> Pitch { Pitch::Freq(self.to_freq()) } + pub fn to_freq_pitch(&self) -> Pitch { + Pitch::Freq(self.to_freq()) + } } -- cgit v1.2.3-70-g09d2