mirror of
https://github.com/cookiengineer/audacity
synced 2025-10-25 15:53:52 +02:00
Update Nyquist to v3.09.
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
#include "cext.h"
|
||||
#include "instrclarall.h"
|
||||
|
||||
void clarinet_all_free();
|
||||
void clarinet_all_free(snd_susp_type a_susp);
|
||||
|
||||
|
||||
typedef struct clarinet_all_susp_struct {
|
||||
@@ -24,20 +24,24 @@ typedef struct clarinet_all_susp_struct {
|
||||
sound_type reed_stiffness;
|
||||
long reed_stiffness_cnt;
|
||||
sample_block_values_type reed_stiffness_ptr;
|
||||
sound_type noise;
|
||||
long noise_cnt;
|
||||
sample_block_values_type noise_ptr;
|
||||
sound_type noise_env;
|
||||
long noise_env_cnt;
|
||||
sample_block_values_type noise_env_ptr;
|
||||
|
||||
struct instr *clar;
|
||||
double frequency;
|
||||
float breath_scale;
|
||||
float reed_scale;
|
||||
float noise_scale;
|
||||
} clarinet_all_susp_node, *clarinet_all_susp_type;
|
||||
|
||||
|
||||
#include "instr.h"
|
||||
#include "instr.h"
|
||||
#include "upsample.h"
|
||||
|
||||
|
||||
void clarinet_all_ssss_fetch(register clarinet_all_susp_type susp, snd_list_type snd_list)
|
||||
void clarinet_all_nsnn_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
||||
{
|
||||
clarinet_all_susp_type susp = (clarinet_all_susp_type) a_susp;
|
||||
int cnt = 0; /* how many samples computed */
|
||||
int togo;
|
||||
int n;
|
||||
@@ -48,15 +52,15 @@ void clarinet_all_ssss_fetch(register clarinet_all_susp_type susp, snd_list_type
|
||||
|
||||
register struct instr * clar_reg;
|
||||
register double frequency_reg;
|
||||
register sample_type noise_scale_reg = susp->noise->scale;
|
||||
register sample_block_values_type noise_ptr_reg;
|
||||
register sample_type reed_stiffness_scale_reg = susp->reed_stiffness->scale;
|
||||
register float breath_scale_reg;
|
||||
register float reed_scale_reg;
|
||||
register float noise_scale_reg;
|
||||
register sample_block_values_type noise_env_ptr_reg;
|
||||
register sample_block_values_type reed_stiffness_ptr_reg;
|
||||
register sample_type freq_env_scale_reg = susp->freq_env->scale;
|
||||
register sample_block_values_type freq_env_ptr_reg;
|
||||
register sample_type breath_env_scale_reg = susp->breath_env->scale;
|
||||
register sample_block_values_type breath_env_ptr_reg;
|
||||
falloc_sample_block(out, "clarinet_all_ssss_fetch");
|
||||
falloc_sample_block(out, "clarinet_all_nsnn_fetch");
|
||||
out_ptr = out->samples;
|
||||
snd_list->block = out;
|
||||
|
||||
@@ -77,37 +81,40 @@ void clarinet_all_ssss_fetch(register clarinet_all_susp_type susp, snd_list_type
|
||||
susp_check_samples(reed_stiffness, reed_stiffness_ptr, reed_stiffness_cnt);
|
||||
togo = min(togo, susp->reed_stiffness_cnt);
|
||||
|
||||
/* don't run past the noise input sample block: */
|
||||
susp_check_samples(noise, noise_ptr, noise_cnt);
|
||||
togo = min(togo, susp->noise_cnt);
|
||||
/* don't run past the noise_env input sample block: */
|
||||
susp_check_samples(noise_env, noise_env_ptr, noise_env_cnt);
|
||||
togo = min(togo, susp->noise_env_cnt);
|
||||
|
||||
/* don't run past terminate time */
|
||||
if (susp->terminate_cnt != UNKNOWN &&
|
||||
susp->terminate_cnt <= susp->susp.current + cnt + togo) {
|
||||
togo = susp->terminate_cnt - (susp->susp.current + cnt);
|
||||
if (togo < 0) togo = 0; /* avoids rounding errros */
|
||||
if (togo == 0) break;
|
||||
}
|
||||
|
||||
n = togo;
|
||||
clar_reg = susp->clar;
|
||||
frequency_reg = susp->frequency;
|
||||
noise_ptr_reg = susp->noise_ptr;
|
||||
breath_scale_reg = susp->breath_scale;
|
||||
reed_scale_reg = susp->reed_scale;
|
||||
noise_scale_reg = susp->noise_scale;
|
||||
noise_env_ptr_reg = susp->noise_env_ptr;
|
||||
reed_stiffness_ptr_reg = susp->reed_stiffness_ptr;
|
||||
freq_env_ptr_reg = susp->freq_env_ptr;
|
||||
breath_env_ptr_reg = susp->breath_env_ptr;
|
||||
out_ptr_reg = out_ptr;
|
||||
if (n) do { /* the inner sample computation loop */
|
||||
|
||||
controlChange(clar_reg, 128, CLAR_CONTROL_CHANGE_CONST * (breath_env_scale_reg * *breath_env_ptr_reg++));
|
||||
controlChange(clar_reg, 2, CLAR_CONTROL_CHANGE_CONST * (reed_stiffness_scale_reg * *reed_stiffness_ptr_reg++));
|
||||
controlChange(clar_reg, 4, CLAR_CONTROL_CHANGE_CONST * (noise_scale_reg * *noise_ptr_reg++));
|
||||
setFrequency(clar_reg, frequency_reg + (freq_env_scale_reg * *freq_env_ptr_reg++));
|
||||
*out_ptr_reg++ = (sample_type) tick(clar_reg);
|
||||
controlChange(clar_reg, 128, breath_scale_reg * *breath_env_ptr_reg++);
|
||||
controlChange(clar_reg, 2, reed_scale_reg * *reed_stiffness_ptr_reg++);
|
||||
controlChange(clar_reg, 4, noise_scale_reg * *noise_env_ptr_reg++);
|
||||
setFrequency(clar_reg, frequency_reg + (freq_env_scale_reg * *freq_env_ptr_reg++));
|
||||
*out_ptr_reg++ = (sample_type) tick(clar_reg);
|
||||
} while (--n); /* inner loop */
|
||||
|
||||
susp->clar = clar_reg;
|
||||
/* using noise_ptr_reg is a bad idea on RS/6000: */
|
||||
susp->noise_ptr += togo;
|
||||
/* using noise_env_ptr_reg is a bad idea on RS/6000: */
|
||||
susp->noise_env_ptr += togo;
|
||||
/* using reed_stiffness_ptr_reg is a bad idea on RS/6000: */
|
||||
susp->reed_stiffness_ptr += togo;
|
||||
/* using freq_env_ptr_reg is a bad idea on RS/6000: */
|
||||
@@ -118,7 +125,7 @@ void clarinet_all_ssss_fetch(register clarinet_all_susp_type susp, snd_list_type
|
||||
susp_took(breath_env_cnt, togo);
|
||||
susp_took(freq_env_cnt, togo);
|
||||
susp_took(reed_stiffness_cnt, togo);
|
||||
susp_took(noise_cnt, togo);
|
||||
susp_took(noise_env_cnt, togo);
|
||||
cnt += togo;
|
||||
} /* outer loop */
|
||||
|
||||
@@ -129,14 +136,12 @@ void clarinet_all_ssss_fetch(register clarinet_all_susp_type susp, snd_list_type
|
||||
snd_list->block_len = cnt;
|
||||
susp->susp.current += cnt;
|
||||
}
|
||||
} /* clarinet_all_ssss_fetch */
|
||||
} /* clarinet_all_nsnn_fetch */
|
||||
|
||||
|
||||
void clarinet_all_toss_fetch(susp, snd_list)
|
||||
register clarinet_all_susp_type susp;
|
||||
snd_list_type snd_list;
|
||||
{
|
||||
long final_count = susp->susp.toss_cnt;
|
||||
void clarinet_all_toss_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
||||
{
|
||||
clarinet_all_susp_type susp = (clarinet_all_susp_type) a_susp;
|
||||
time_type final_time = susp->susp.t0;
|
||||
long n;
|
||||
|
||||
@@ -152,10 +157,10 @@ void clarinet_all_toss_fetch(susp, snd_list)
|
||||
while ((round((final_time - susp->reed_stiffness->t0) * susp->reed_stiffness->sr)) >=
|
||||
susp->reed_stiffness->current)
|
||||
susp_get_samples(reed_stiffness, reed_stiffness_ptr, reed_stiffness_cnt);
|
||||
/* fetch samples from noise up to final_time for this block of zeros */
|
||||
while ((round((final_time - susp->noise->t0) * susp->noise->sr)) >=
|
||||
susp->noise->current)
|
||||
susp_get_samples(noise, noise_ptr, noise_cnt);
|
||||
/* fetch samples from noise_env up to final_time for this block of zeros */
|
||||
while ((round((final_time - susp->noise_env->t0) * susp->noise_env->sr)) >=
|
||||
susp->noise_env->current)
|
||||
susp_get_samples(noise_env, noise_env_ptr, noise_env_cnt);
|
||||
/* convert to normal processing when we hit final_count */
|
||||
/* we want each signal positioned at final_time */
|
||||
n = round((final_time - susp->breath_env->t0) * susp->breath_env->sr -
|
||||
@@ -170,38 +175,40 @@ void clarinet_all_toss_fetch(susp, snd_list)
|
||||
(susp->reed_stiffness->current - susp->reed_stiffness_cnt));
|
||||
susp->reed_stiffness_ptr += n;
|
||||
susp_took(reed_stiffness_cnt, n);
|
||||
n = round((final_time - susp->noise->t0) * susp->noise->sr -
|
||||
(susp->noise->current - susp->noise_cnt));
|
||||
susp->noise_ptr += n;
|
||||
susp_took(noise_cnt, n);
|
||||
n = round((final_time - susp->noise_env->t0) * susp->noise_env->sr -
|
||||
(susp->noise_env->current - susp->noise_env_cnt));
|
||||
susp->noise_env_ptr += n;
|
||||
susp_took(noise_env_cnt, n);
|
||||
susp->susp.fetch = susp->susp.keep_fetch;
|
||||
(*(susp->susp.fetch))(susp, snd_list);
|
||||
(*(susp->susp.fetch))(a_susp, snd_list);
|
||||
}
|
||||
|
||||
|
||||
void clarinet_all_mark(clarinet_all_susp_type susp)
|
||||
void clarinet_all_mark(snd_susp_type a_susp)
|
||||
{
|
||||
clarinet_all_susp_type susp = (clarinet_all_susp_type) a_susp;
|
||||
sound_xlmark(susp->breath_env);
|
||||
sound_xlmark(susp->freq_env);
|
||||
sound_xlmark(susp->reed_stiffness);
|
||||
sound_xlmark(susp->noise);
|
||||
sound_xlmark(susp->noise_env);
|
||||
}
|
||||
|
||||
|
||||
void clarinet_all_free(clarinet_all_susp_type susp)
|
||||
void clarinet_all_free(snd_susp_type a_susp)
|
||||
{
|
||||
|
||||
deleteInstrument(susp->clar);
|
||||
clarinet_all_susp_type susp = (clarinet_all_susp_type) a_susp;
|
||||
deleteInstrument(susp->clar);
|
||||
sound_unref(susp->breath_env);
|
||||
sound_unref(susp->freq_env);
|
||||
sound_unref(susp->reed_stiffness);
|
||||
sound_unref(susp->noise);
|
||||
sound_unref(susp->noise_env);
|
||||
ffree_generic(susp, sizeof(clarinet_all_susp_node), "clarinet_all_free");
|
||||
}
|
||||
|
||||
|
||||
void clarinet_all_print_tree(clarinet_all_susp_type susp, int n)
|
||||
void clarinet_all_print_tree(snd_susp_type a_susp, int n)
|
||||
{
|
||||
clarinet_all_susp_type susp = (clarinet_all_susp_type) a_susp;
|
||||
indent(n);
|
||||
stdputstr("breath_env:");
|
||||
sound_print_tree_1(susp->breath_env, n);
|
||||
@@ -215,17 +222,16 @@ void clarinet_all_print_tree(clarinet_all_susp_type susp, int n)
|
||||
sound_print_tree_1(susp->reed_stiffness, n);
|
||||
|
||||
indent(n);
|
||||
stdputstr("noise:");
|
||||
sound_print_tree_1(susp->noise, n);
|
||||
stdputstr("noise_env:");
|
||||
sound_print_tree_1(susp->noise_env, n);
|
||||
}
|
||||
|
||||
|
||||
sound_type snd_make_clarinet_all(double freq, sound_type breath_env, sound_type freq_env, double vibrato_freq, double vibrato_gain, sound_type reed_stiffness, sound_type noise, rate_type sr)
|
||||
sound_type snd_make_clarinet_all(double freq, sound_type breath_env, sound_type freq_env, double vibrato_freq, double vibrato_gain, sound_type reed_stiffness, sound_type noise_env, rate_type sr)
|
||||
{
|
||||
register clarinet_all_susp_type susp;
|
||||
/* sr specified as input parameter */
|
||||
time_type t0 = breath_env->t0;
|
||||
int interp_desc = 0;
|
||||
sample_type scale_factor = 1.0F;
|
||||
time_type t0_min = t0;
|
||||
falloc_generic(susp, clarinet_all_susp_node, "snd_make_clarinet_all");
|
||||
@@ -234,20 +240,41 @@ sound_type snd_make_clarinet_all(double freq, sound_type breath_env, sound_type
|
||||
controlChange(susp->clar, 11, CLAR_CONTROL_CHANGE_CONST * vibrato_freq);
|
||||
controlChange(susp->clar, 1, CLAR_CONTROL_CHANGE_CONST * vibrato_gain);;
|
||||
susp->frequency = freq;
|
||||
susp->susp.fetch = clarinet_all_ssss_fetch;
|
||||
susp->breath_scale = breath_env->scale * CLAR_CONTROL_CHANGE_CONST;
|
||||
susp->reed_scale = reed_stiffness->scale * CLAR_CONTROL_CHANGE_CONST;
|
||||
susp->noise_scale = noise_env->scale * CLAR_CONTROL_CHANGE_CONST;
|
||||
|
||||
/* make sure no sample rate is too high */
|
||||
if (breath_env->sr > sr) {
|
||||
sound_unref(breath_env);
|
||||
snd_badsr();
|
||||
} else if (breath_env->sr < sr) breath_env = snd_make_up(sr, breath_env);
|
||||
if (freq_env->sr > sr) {
|
||||
sound_unref(freq_env);
|
||||
snd_badsr();
|
||||
} else if (freq_env->sr < sr) freq_env = snd_make_up(sr, freq_env);
|
||||
if (reed_stiffness->sr > sr) {
|
||||
sound_unref(reed_stiffness);
|
||||
snd_badsr();
|
||||
} else if (reed_stiffness->sr < sr) reed_stiffness = snd_make_up(sr, reed_stiffness);
|
||||
if (noise_env->sr > sr) {
|
||||
sound_unref(noise_env);
|
||||
snd_badsr();
|
||||
} else if (noise_env->sr < sr) noise_env = snd_make_up(sr, noise_env);
|
||||
susp->susp.fetch = clarinet_all_nsnn_fetch;
|
||||
susp->terminate_cnt = UNKNOWN;
|
||||
/* handle unequal start times, if any */
|
||||
if (t0 < breath_env->t0) sound_prepend_zeros(breath_env, t0);
|
||||
if (t0 < freq_env->t0) sound_prepend_zeros(freq_env, t0);
|
||||
if (t0 < reed_stiffness->t0) sound_prepend_zeros(reed_stiffness, t0);
|
||||
if (t0 < noise->t0) sound_prepend_zeros(noise, t0);
|
||||
if (t0 < noise_env->t0) sound_prepend_zeros(noise_env, t0);
|
||||
/* minimum start time over all inputs: */
|
||||
t0_min = min(breath_env->t0, min(freq_env->t0, min(reed_stiffness->t0, min(noise->t0, t0))));
|
||||
t0_min = min(breath_env->t0, min(freq_env->t0, min(reed_stiffness->t0, min(noise_env->t0, t0))));
|
||||
/* how many samples to toss before t0: */
|
||||
susp->susp.toss_cnt = (long) ((t0 - t0_min) * sr + 0.5);
|
||||
if (susp->susp.toss_cnt > 0) {
|
||||
susp->susp.keep_fetch = susp->susp.fetch;
|
||||
susp->susp.fetch = clarinet_all_toss_fetch;
|
||||
susp->susp.keep_fetch = susp->susp.fetch;
|
||||
susp->susp.fetch = clarinet_all_toss_fetch;
|
||||
}
|
||||
|
||||
/* initialize susp state */
|
||||
@@ -265,17 +292,17 @@ sound_type snd_make_clarinet_all(double freq, sound_type breath_env, sound_type
|
||||
susp->freq_env_cnt = 0;
|
||||
susp->reed_stiffness = reed_stiffness;
|
||||
susp->reed_stiffness_cnt = 0;
|
||||
susp->noise = noise;
|
||||
susp->noise_cnt = 0;
|
||||
susp->noise_env = noise_env;
|
||||
susp->noise_env_cnt = 0;
|
||||
return sound_create((snd_susp_type)susp, t0, sr, scale_factor);
|
||||
}
|
||||
|
||||
|
||||
sound_type snd_clarinet_all(double freq, sound_type breath_env, sound_type freq_env, double vibrato_freq, double vibrato_gain, sound_type reed_stiffness, sound_type noise, rate_type sr)
|
||||
sound_type snd_clarinet_all(double freq, sound_type breath_env, sound_type freq_env, double vibrato_freq, double vibrato_gain, sound_type reed_stiffness, sound_type noise_env, rate_type sr)
|
||||
{
|
||||
sound_type breath_env_copy = sound_copy(breath_env);
|
||||
sound_type freq_env_copy = sound_copy(freq_env);
|
||||
sound_type reed_stiffness_copy = sound_copy(reed_stiffness);
|
||||
sound_type noise_copy = sound_copy(noise);
|
||||
return snd_make_clarinet_all(freq, breath_env_copy, freq_env_copy, vibrato_freq, vibrato_gain, reed_stiffness_copy, noise_copy, sr);
|
||||
sound_type noise_env_copy = sound_copy(noise_env);
|
||||
return snd_make_clarinet_all(freq, breath_env_copy, freq_env_copy, vibrato_freq, vibrato_gain, reed_stiffness_copy, noise_env_copy, sr);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user