From 799e05b0de8d92696dd492afbc758daf8bd32603 Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Tue, 14 Mar 2017 05:24:46 +0100 Subject: [PATCH] src/effects/: include aubio_priv.h, not config.h, use <> for external includes --- src/effects/pitchshift_rubberband.c | 2 +- src/effects/rubberband_utils.c | 2 +- src/effects/timestretch_dummy.c | 3 +-- src/effects/timestretch_rubberband.c | 5 ++--- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/effects/pitchshift_rubberband.c b/src/effects/pitchshift_rubberband.c index d58e6222..4acbf6fc 100644 --- a/src/effects/pitchshift_rubberband.c +++ b/src/effects/pitchshift_rubberband.c @@ -25,7 +25,7 @@ #include "fvec.h" #include "effects/pitchshift.h" -#include "rubberband/rubberband-c.h" +#include /** generic pitch shifting structure */ struct _aubio_pitchshift_t diff --git a/src/effects/rubberband_utils.c b/src/effects/rubberband_utils.c index d24e8f54..d8d039e3 100644 --- a/src/effects/rubberband_utils.c +++ b/src/effects/rubberband_utils.c @@ -4,7 +4,7 @@ #ifdef HAVE_RUBBERBAND -#include "rubberband/rubberband-c.h" +#include // check rubberband is 1.8.1, warn if 1.3 #if !((RUBBERBAND_API_MAJOR_VERSION >= 2) && \ diff --git a/src/effects/timestretch_dummy.c b/src/effects/timestretch_dummy.c index a93b594e..adb80554 100644 --- a/src/effects/timestretch_dummy.c +++ b/src/effects/timestretch_dummy.c @@ -18,11 +18,10 @@ */ -#include "config.h" +#include "aubio_priv.h" #ifndef HAVE_RUBBERBAND -#include "aubio_priv.h" #include "fvec.h" #include "effects/timestretch.h" diff --git a/src/effects/timestretch_rubberband.c b/src/effects/timestretch_rubberband.c index a2cdc298..42484c6a 100644 --- a/src/effects/timestretch_rubberband.c +++ b/src/effects/timestretch_rubberband.c @@ -18,17 +18,16 @@ */ -#include "config.h" +#include "aubio_priv.h" #ifdef HAVE_RUBBERBAND -#include "aubio_priv.h" #include "fvec.h" #include "fmat.h" #include "io/source.h" #include "effects/timestretch.h" -#include "rubberband/rubberband-c.h" +#include #define MIN_STRETCH_RATIO 0.025 #define MAX_STRETCH_RATIO 40. -- 2.11.0