mirror of
https://github.com/cookiengineer/audacity
synced 2025-11-27 15:50:10 +01:00
Update Nyquist to v3.09.
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
#include "cext.h"
|
||||
#include "slope.h"
|
||||
|
||||
void slope_free();
|
||||
void slope_free(snd_susp_type a_susp);
|
||||
|
||||
|
||||
typedef struct slope_susp_struct {
|
||||
@@ -25,8 +25,9 @@ typedef struct slope_susp_struct {
|
||||
} slope_susp_node, *slope_susp_type;
|
||||
|
||||
|
||||
void slope_n_fetch(register slope_susp_type susp, snd_list_type snd_list)
|
||||
void slope_n_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
||||
{
|
||||
slope_susp_type susp = (slope_susp_type) a_susp;
|
||||
int cnt = 0; /* how many samples computed */
|
||||
int togo;
|
||||
int n;
|
||||
@@ -55,6 +56,7 @@ void slope_n_fetch(register slope_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;
|
||||
}
|
||||
|
||||
@@ -66,6 +68,7 @@ void slope_n_fetch(register slope_susp_type susp, snd_list_type snd_list)
|
||||
* AND cnt > 0 (we're not at the beginning of the
|
||||
* output block).
|
||||
*/
|
||||
if (to_stop < 0) to_stop = 0; /* avoids rounding errors */
|
||||
if (to_stop < togo) {
|
||||
if (to_stop == 0) {
|
||||
if (cnt) {
|
||||
@@ -89,9 +92,9 @@ void slope_n_fetch(register slope_susp_type susp, snd_list_type snd_list)
|
||||
input_ptr_reg = susp->input_ptr;
|
||||
out_ptr_reg = out_ptr;
|
||||
if (n) do { /* the inner sample computation loop */
|
||||
{ register sample_type x = *input_ptr_reg++;
|
||||
*out_ptr_reg++ = (sample_type) ((x - prev_reg) * scale_reg);
|
||||
prev_reg = x;};
|
||||
{ register sample_type x = *input_ptr_reg++;
|
||||
*out_ptr_reg++ = (sample_type) ((x - prev_reg) * scale_reg);
|
||||
prev_reg = x;};
|
||||
} while (--n); /* inner loop */
|
||||
|
||||
susp->prev = prev_reg;
|
||||
@@ -118,11 +121,9 @@ prev_reg = x;};
|
||||
} /* slope_n_fetch */
|
||||
|
||||
|
||||
void slope_toss_fetch(susp, snd_list)
|
||||
register slope_susp_type susp;
|
||||
snd_list_type snd_list;
|
||||
{
|
||||
long final_count = susp->susp.toss_cnt;
|
||||
void slope_toss_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
||||
{
|
||||
slope_susp_type susp = (slope_susp_type) a_susp;
|
||||
time_type final_time = susp->susp.t0;
|
||||
long n;
|
||||
|
||||
@@ -137,25 +138,28 @@ void slope_toss_fetch(susp, snd_list)
|
||||
susp->input_ptr += n;
|
||||
susp_took(input_cnt, n);
|
||||
susp->susp.fetch = susp->susp.keep_fetch;
|
||||
(*(susp->susp.fetch))(susp, snd_list);
|
||||
(*(susp->susp.fetch))(a_susp, snd_list);
|
||||
}
|
||||
|
||||
|
||||
void slope_mark(slope_susp_type susp)
|
||||
void slope_mark(snd_susp_type a_susp)
|
||||
{
|
||||
slope_susp_type susp = (slope_susp_type) a_susp;
|
||||
sound_xlmark(susp->input);
|
||||
}
|
||||
|
||||
|
||||
void slope_free(slope_susp_type susp)
|
||||
void slope_free(snd_susp_type a_susp)
|
||||
{
|
||||
slope_susp_type susp = (slope_susp_type) a_susp;
|
||||
sound_unref(susp->input);
|
||||
ffree_generic(susp, sizeof(slope_susp_node), "slope_free");
|
||||
}
|
||||
|
||||
|
||||
void slope_print_tree(slope_susp_type susp, int n)
|
||||
void slope_print_tree(snd_susp_type a_susp, int n)
|
||||
{
|
||||
slope_susp_type susp = (slope_susp_type) a_susp;
|
||||
indent(n);
|
||||
stdputstr("input:");
|
||||
sound_print_tree_1(susp->input, n);
|
||||
@@ -167,7 +171,6 @@ sound_type snd_make_slope(sound_type input)
|
||||
register slope_susp_type susp;
|
||||
rate_type sr = input->sr;
|
||||
time_type t0 = input->t0;
|
||||
int interp_desc = 0;
|
||||
sample_type scale_factor = 1.0F;
|
||||
time_type t0_min = t0;
|
||||
falloc_generic(susp, slope_susp_node, "snd_make_slope");
|
||||
@@ -183,8 +186,8 @@ sound_type snd_make_slope(sound_type input)
|
||||
/* Toss an extra 1 samples to make up for internal buffering: */
|
||||
susp->susp.toss_cnt = (long) ((t0 - t0_min) * sr + 1.5);
|
||||
if (susp->susp.toss_cnt > 0) {
|
||||
susp->susp.keep_fetch = susp->susp.fetch;
|
||||
susp->susp.fetch = slope_toss_fetch;
|
||||
susp->susp.keep_fetch = susp->susp.fetch;
|
||||
susp->susp.fetch = slope_toss_fetch;
|
||||
}
|
||||
|
||||
/* initialize susp state */
|
||||
|
||||
Reference in New Issue
Block a user