From e9e2a870df3deec70e7eaedd97bfc24412fba595 Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Sat, 7 Dec 2013 22:48:31 -0500 Subject: [PATCH] examples/: define aubio_process_func_t once in utils.h --- examples/jackio.c | 3 ++- examples/jackio.h | 2 -- examples/parse_args.h | 2 -- examples/utils.h | 2 ++ 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/jackio.c b/examples/jackio.c index 83290b3b..f4dd554e 100644 --- a/examples/jackio.c +++ b/examples/jackio.c @@ -22,8 +22,9 @@ #include "config.h" #if HAVE_JACK -#include "aubio_priv.h" +#include "utils.h" // for aubio_process_func_t #include "jackio.h" +#include "aubio_priv.h" typedef jack_default_audio_sample_t jack_sample_t; diff --git a/examples/jackio.h b/examples/jackio.h index 994e829d..74803c7f 100644 --- a/examples/jackio.h +++ b/examples/jackio.h @@ -39,8 +39,6 @@ extern "C" /** jack object */ typedef struct _aubio_jack_t aubio_jack_t; -/** jack process function */ -typedef int (*aubio_process_func_t) (fvec_t * input, fvec_t * output); /** jack device creation function */ aubio_jack_t *new_aubio_jack (uint_t hop_size, diff --git a/examples/parse_args.h b/examples/parse_args.h index 3bc5c679..0198230b 100644 --- a/examples/parse_args.h +++ b/examples/parse_args.h @@ -40,8 +40,6 @@ extern char_t * tempo_method; extern smpl_t silence_threshold; extern uint_t mix_input; -typedef int (*aubio_process_func_t)(fvec_t * input, fvec_t * output); - // functions defined in utils.c extern void examples_common_init (int argc, char **argv); extern void examples_common_del (void); diff --git a/examples/utils.h b/examples/utils.h index b2f4ac83..ddbdb944 100644 --- a/examples/utils.h +++ b/examples/utils.h @@ -51,3 +51,5 @@ typedef void (aubio_print_func_t) (void); void send_noteon (int pitch, int velo); +/** common process function */ +typedef int (*aubio_process_func_t) (fvec_t * input, fvec_t * output); -- 2.11.0