From 7f2c515ad6e1b930498b03b555ed0543f622bd42 Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Sat, 7 Dec 2013 08:56:32 -0500 Subject: [PATCH] examples/utils.h: move aubio_process_func_t to parse_args.h to avoid redefinition --- examples/parse_args.h | 3 ++- examples/utils.h | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/parse_args.h b/examples/parse_args.h index d016dd1c..0708c5e7 100644 --- a/examples/parse_args.h +++ b/examples/parse_args.h @@ -40,6 +40,8 @@ extern char_t * tempo_method; extern smpl_t silence; 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); @@ -52,7 +54,6 @@ extern int blocks; extern fvec_t *ibuf; extern fvec_t *obuf; - const char *prog_name; void diff --git a/examples/utils.h b/examples/utils.h index d85388cf..b2f4ac83 100644 --- a/examples/utils.h +++ b/examples/utils.h @@ -49,6 +49,5 @@ #endif typedef void (aubio_print_func_t) (void); -typedef int (*aubio_process_func_t)(fvec_t * input, fvec_t * output); void send_noteon (int pitch, int velo); -- 2.11.0