1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-10 16:43:33 +02:00

Update Nyquist to v3.09.

This commit is contained in:
Leland Lucius
2015-04-07 22:10:17 -05:00
parent f88b27e6d8
commit 9fb0ce5b82
358 changed files with 26327 additions and 7043 deletions

View File

@@ -9,7 +9,7 @@
#include "cext.h"
#include "instrsax.h"
void sax_free();
void sax_free(snd_susp_type a_susp);
typedef struct sax_susp_struct {
@@ -21,14 +21,16 @@ typedef struct sax_susp_struct {
struct instr *sax;
int temp_ret_value;
float breath_scale;
} sax_susp_node, *sax_susp_type;
#include "instr.h"
#include "instr.h"
#include "upsample.h"
void sax_n_fetch(register sax_susp_type susp, snd_list_type snd_list)
void sax_n_fetch(snd_susp_type a_susp, snd_list_type snd_list)
{
sax_susp_type susp = (sax_susp_type) a_susp;
int cnt = 0; /* how many samples computed */
int togo;
int n;
@@ -38,6 +40,7 @@ void sax_n_fetch(register sax_susp_type susp, snd_list_type snd_list)
register sample_block_values_type out_ptr_reg;
register struct instr * sax_reg;
register float breath_scale_reg;
register sample_block_values_type breath_env_ptr_reg;
falloc_sample_block(out, "sax_n_fetch");
out_ptr = out->samples;
@@ -56,20 +59,22 @@ void sax_n_fetch(register sax_susp_type susp, snd_list_type snd_list)
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;
sax_reg = susp->sax;
breath_scale_reg = susp->breath_scale;
breath_env_ptr_reg = susp->breath_env_ptr;
out_ptr_reg = out_ptr;
if (n) do { /* the inner sample computation loop */
controlChange(sax_reg, 128, SAX_CONTROL_CHANGE_CONST * *breath_env_ptr_reg++);
*out_ptr_reg++ = (sample_type) tick(sax_reg);
controlChange(sax_reg, 128, breath_scale_reg * *breath_env_ptr_reg++);
*out_ptr_reg++ = (sample_type) tick(sax_reg);
} while (--n); /* inner loop */
susp->sax = sax_reg;
susp->breath_scale = breath_scale_reg;
/* using breath_env_ptr_reg is a bad idea on RS/6000: */
susp->breath_env_ptr += togo;
out_ptr += togo;
@@ -87,72 +92,9 @@ void sax_n_fetch(register sax_susp_type susp, snd_list_type snd_list)
} /* sax_n_fetch */
void sax_s_fetch(register sax_susp_type susp, snd_list_type snd_list)
{
int cnt = 0; /* how many samples computed */
int togo;
int n;
sample_block_type out;
register sample_block_values_type out_ptr;
register sample_block_values_type out_ptr_reg;
register struct instr * sax_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, "sax_s_fetch");
out_ptr = out->samples;
snd_list->block = out;
while (cnt < max_sample_block_len) { /* outer loop */
/* first compute how many samples to generate in inner loop: */
/* don't overflow the output sample block: */
togo = max_sample_block_len - cnt;
/* don't run past the breath_env input sample block: */
susp_check_term_samples(breath_env, breath_env_ptr, breath_env_cnt);
togo = min(togo, susp->breath_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) break;
}
n = togo;
sax_reg = susp->sax;
breath_env_ptr_reg = susp->breath_env_ptr;
out_ptr_reg = out_ptr;
if (n) do { /* the inner sample computation loop */
controlChange(sax_reg, 128, SAX_CONTROL_CHANGE_CONST * (breath_env_scale_reg * *breath_env_ptr_reg++));
*out_ptr_reg++ = (sample_type) tick(sax_reg);
} while (--n); /* inner loop */
susp->sax = sax_reg;
/* using breath_env_ptr_reg is a bad idea on RS/6000: */
susp->breath_env_ptr += togo;
out_ptr += togo;
susp_took(breath_env_cnt, togo);
cnt += togo;
} /* outer loop */
/* test for termination */
if (togo == 0 && cnt == 0) {
snd_list_terminate(snd_list);
} else {
snd_list->block_len = cnt;
susp->susp.current += cnt;
}
} /* sax_s_fetch */
void sax_toss_fetch(susp, snd_list)
register sax_susp_type susp;
snd_list_type snd_list;
{
long final_count = susp->susp.toss_cnt;
void sax_toss_fetch(snd_susp_type a_susp, snd_list_type snd_list)
{
sax_susp_type susp = (sax_susp_type) a_susp;
time_type final_time = susp->susp.t0;
long n;
@@ -167,27 +109,29 @@ void sax_toss_fetch(susp, snd_list)
susp->breath_env_ptr += n;
susp_took(breath_env_cnt, n);
susp->susp.fetch = susp->susp.keep_fetch;
(*(susp->susp.fetch))(susp, snd_list);
(*(susp->susp.fetch))(a_susp, snd_list);
}
void sax_mark(sax_susp_type susp)
void sax_mark(snd_susp_type a_susp)
{
sax_susp_type susp = (sax_susp_type) a_susp;
sound_xlmark(susp->breath_env);
}
void sax_free(sax_susp_type susp)
void sax_free(snd_susp_type a_susp)
{
deleteInstrument(susp->sax);
sax_susp_type susp = (sax_susp_type) a_susp;
deleteInstrument(susp->sax);
sound_unref(susp->breath_env);
ffree_generic(susp, sizeof(sax_susp_node), "sax_free");
}
void sax_print_tree(sax_susp_type susp, int n)
void sax_print_tree(snd_susp_type a_susp, int n)
{
sax_susp_type susp = (sax_susp_type) a_susp;
indent(n);
stdputstr("breath_env:");
sound_print_tree_1(susp->breath_env, n);
@@ -199,22 +143,20 @@ sound_type snd_make_sax(double freq, sound_type breath_env, rate_type sr)
register sax_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, sax_susp_node, "snd_make_sax");
susp->sax = initInstrument(SAXOFONY, round(sr));
controlChange(susp->sax, 1, 0.0);;
susp->temp_ret_value = noteOn(susp->sax, freq, 1.0);
susp->breath_scale = breath_env->scale * SAX_CONTROL_CHANGE_CONST;
/* select a susp fn based on sample rates */
interp_desc = (interp_desc << 2) + interp_style(breath_env, sr);
switch (interp_desc) {
case INTERP_n: susp->susp.fetch = sax_n_fetch; break;
case INTERP_s: susp->susp.fetch = sax_s_fetch; break;
default: snd_badsr(); break;
}
/* 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);
susp->susp.fetch = sax_n_fetch;
susp->terminate_cnt = UNKNOWN;
/* handle unequal start times, if any */
if (t0 < breath_env->t0) sound_prepend_zeros(breath_env, t0);
@@ -223,8 +165,8 @@ sound_type snd_make_sax(double freq, sound_type breath_env, rate_type sr)
/* 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 = sax_toss_fetch;
susp->susp.keep_fetch = susp->susp.fetch;
susp->susp.fetch = sax_toss_fetch;
}
/* initialize susp state */