diff --git a/src/dsp/mod.rs b/src/dsp/mod.rs index aede570..91df89e 100644 --- a/src/dsp/mod.rs +++ b/src/dsp/mod.rs @@ -973,10 +973,10 @@ macro_rules! node_list { {2 0 mode setting(0) mode fa_noise_mode 0 1} [0 sig], formant => Formant UIType::Generic UICategory::Osc - (0 freq n_pit d_pit r_fq f_freq stp_d 0.0, 1.0, 0.5) - (1 form n_pit d_pit r_fq f_freq stp_d 0.0, 1.0, 0.5) - (2 atk n_pit d_pit r_fq f_freq stp_d 0.0, 1.0, 0.5) - (3 dcy n_pit d_pit r_fq f_freq stp_d 0.0, 1.0, 0.5) + (0 freq n_pit d_pit r_fq f_freq stp_d -1.0, 1.0, 440.0) + (1 form n_pit d_pit r_fq f_freq stp_d -1.0, 1.0, 440.0) + (2 atk n_pit d_pit r_fq f_freq stp_d -1.0, 1.0, 44.0) + (3 dcy n_pit d_pit r_fq f_freq stp_d -1.0, 1.0, 44.0) [0 sig], sfilter => SFilter UIType::Generic UICategory::Signal (0 inp n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0) diff --git a/src/dsp/node_formant.rs b/src/dsp/node_formant.rs index 3084c29..28186d0 100644 --- a/src/dsp/node_formant.rs +++ b/src/dsp/node_formant.rs @@ -64,9 +64,9 @@ impl DspNode for Formant { for frame in 0..ctx.nframes() { // get the inputs let base_freq = denorm::Formant::freq(base_freq, frame); - let formant_freq = denorm::Formant::freq(formant_freq, frame); - let attack_freq = denorm::Formant::freq(attack_freq, frame); - let decay_freq = denorm::Formant::freq(decay_freq, frame); + let formant_freq = denorm::Formant::form(formant_freq, frame); + let attack_freq = denorm::Formant::atk(attack_freq, frame); + let decay_freq = denorm::Formant::dcy(decay_freq, frame); // where the two decays meet let carrier_center = decay_freq / (attack_freq + decay_freq);