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

proper macros I hope

Browse source
This commit is contained in:
Dimas Leenman 2022-07-20 14:31:00 +02:00
parent 505662414a
commit 7b20af0eec
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/dsp/mod.rs
View file

@ -972,6 +972,12 @@ macro_rules! node_list {
(1 offs n_id d_id r_s f_def stp_d -1.0, 1.0, 0.0) (1 offs n_id d_id r_s f_def stp_d -1.0, 1.0, 0.0)
{2 0 mode setting(0) mode fa_noise_mode 0 1} {2 0 mode setting(0) mode fa_noise_mode 0 1}
[0 sig], [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 sig],
sfilter => SFilter UIType::Generic UICategory::Signal sfilter => SFilter UIType::Generic UICategory::Signal
(0 inp n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0) (0 inp n_id d_id r_id f_def stp_d -1.0, 1.0, 0.0)
(1 freq n_pit d_pit r_fq f_freq stp_d -1.0, 0.5647131, 1000.0) (1 freq n_pit d_pit r_fq f_freq stp_d -1.0, 0.5647131, 1000.0)
@ -1004,13 +1010,7 @@ macro_rules! node_list {
(14 mix n_id d_id r_id f_def stp_d 0.0, 1.0, 0.5) (14 mix n_id d_id r_id f_def stp_d 0.0, 1.0, 0.5)
[0 sig_l] [0 sig_l]
[1 sig_r], [1 sig_r],
formant => Formant UIType::Generic UICategory::Signal test => Test UIType::Generic UICategory::IOUtil
(0 freq n_id d_id r_id f_def stp_d 0.0, 1.0, 0.5)
(1 form n_id d_id r_id f_def stp_d 0.0, 1.0, 0.5)
(2 atk n_id d_id r_id f_def stp_d 0.0, 1.0, 0.5)
(3 dcy n_id d_id r_id f_def stp_d 0.0, 1.0, 0.5)
[0 sig],
test => Test UIType::Generic UICategory::IOUtil
(0 f n_id d_id r_id f_def stp_d 0.0, 1.0, 0.5) (0 f n_id d_id r_id f_def stp_d 0.0, 1.0, 0.5)
{1 0 p param(0.0) knob fa_test_s 0 10} {1 0 p param(0.0) knob fa_test_s 0 10}
{2 1 trig param(0.0) knob fa_test_s 0 0} {2 1 trig param(0.0) knob fa_test_s 0 0}

8
src/dsp/node_formant.rs
View file

@ -63,10 +63,10 @@ impl DspNode for Formant {
for frame in 0..ctx.nframes() { for frame in 0..ctx.nframes() {
// get the inputs // get the inputs
let base_freq = denorm::Sampl::freq(base_freq, frame); let base_freq = denorm::Formant::freq(base_freq, frame);
let formant_freq = denorm::Sampl::freq(formant_freq, frame); let formant_freq = denorm::Formant::freq(formant_freq, frame);
let attack_freq = denorm::Sampl::freq(attack_freq, frame); let attack_freq = denorm::Formant::freq(attack_freq, frame);
let decay_freq = denorm::Sampl::freq(decay_freq, frame); let decay_freq = denorm::Formant::freq(decay_freq, frame);
// where the two decays meet // where the two decays meet
let carrier_center = decay_freq / (attack_freq + decay_freq); let carrier_center = decay_freq / (attack_freq + decay_freq);