audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use casts with function pointers to quiet compilation warnings in Nyquist

This commit is contained in:
Paul Licameli 2018-02-26 11:18:22 -05:00
parent 8a216e86c2
commit 5aa70545d5
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib-src/libnyquist/nyquist/nyqsrc/convolve.c
View File

@ -222,7 +222,7 @@ void convolve_toss_fetch(susp, snd_list)
susp->x_snd_ptr += n;
susp_took(x_snd_cnt, n);
susp->susp.fetch = susp->susp.keep_fetch;
(*(susp->susp.fetch))(susp, snd_list);
(*(susp->susp.fetch))((snd_susp_type)susp, snd_list);
}
@ -264,7 +264,7 @@ sound_type snd_make_convolve(sound_type x_snd, sound_type h_snd)
susp->x_buf_len = 2 * susp->h_len;
susp->x_buffer_pointer = calloc((2 * (susp->h_len)), sizeof(float));
susp->x_buffer_current = susp->x_buffer_pointer;
susp->susp.fetch = convolve_s_fetch;
susp->susp.fetch = (snd_fetch_fn)convolve_s_fetch;
susp->terminate_cnt = UNKNOWN;
/* handle unequal start times, if any */
if (t0 < x_snd->t0) sound_prepend_zeros(x_snd, t0);
@ -273,16 +273,16 @@ sound_type snd_make_convolve(sound_type x_snd, sound_type h_snd)
/* 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.keep_fetch = (snd_fetch_fn)susp->susp.fetch;
susp->susp.fetch = convolve_toss_fetch;
}
/* initialize susp state */
susp->susp.free = convolve_free;
susp->susp.free = (snd_free_fn)convolve_free;
susp->susp.sr = sr;
susp->susp.t0 = t0;
susp->susp.mark = convolve_mark;
susp->susp.print_tree = convolve_print_tree;
susp->susp.mark = (snd_mark_fn)convolve_mark;
susp->susp.print_tree = (snd_print_tree_fn)convolve_print_tree;
susp->susp.name = "convolve";
susp->logically_stopped = false;
susp->susp.log_stop_cnt = logical_stop_cnt_cvt(x_snd);

15
lib-src/libnyquist/nyquist/nyqsrc/sound.h
View File

@ -272,12 +272,19 @@ typedef struct {
/* forward declaration for circular type dependencies */
typedef struct snd_list_struct *snd_list_type;
struct snd_susp_struct;
typedef void (*snd_fetch_fn)(struct snd_susp_struct *, snd_list_type snd_list);
typedef void (*snd_free_fn)(struct snd_susp_struct *);
typedef void (*snd_mark_fn)(struct snd_susp_struct *); /* marks LVAL nodes for GC */
typedef void (*snd_print_tree_fn)(struct snd_susp_struct *, int);
typedef struct snd_susp_struct {
void (*fetch)(struct snd_susp_struct *, snd_list_type snd_list);
snd_fetch_fn fetch;
void (*keep_fetch)(struct snd_susp_struct *, snd_list_type snd_list);
void (*free)(struct snd_susp_struct *);
void (*mark)(struct snd_susp_struct *); /* marks LVAL nodes for GC */
void (*print_tree)(struct snd_susp_struct *, int); /* debugging */
snd_free_fn free;
snd_mark_fn mark;
snd_print_tree_fn print_tree; /* debugging */
char *name; /* string name for debugging */
long toss_cnt; /* return this many zeros, then compute */
long current; /* current sample number */

6
lib-src/libnyquist/nyx.c
View File

@ -675,11 +675,11 @@ void nyx_set_input_audio(nyx_audio_callback callback,
susp->len = len;
susp->channel = ch;
susp->susp.fetch = nyx_susp_fetch;
susp->susp.fetch = (snd_fetch_fn)nyx_susp_fetch;
susp->susp.keep_fetch = NULL;
susp->susp.free = nyx_susp_free;
susp->susp.free = (snd_free_fn)nyx_susp_free;
susp->susp.mark = NULL;
susp->susp.print_tree = nyx_susp_print_tree;
susp->susp.print_tree = (snd_print_tree_fn)nyx_susp_print_tree;
susp->susp.name = "nyx";
susp->susp.toss_cnt = 0;
susp->susp.current = 0;