From: Paul Brossier <piem@piem.org>
Date: Tue, 14 Mar 2017 04:24:46 +0000 (+0100)
Subject: src/effects/: include aubio_priv.h, not config.h, use <> for external includes
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=ea3a113c242bedbf2ad0eff21ceaca00114987b9;p=aubio.git

src/effects/: include aubio_priv.h, not config.h, use <> for external includes
---

diff --git a/src/effects/pitchshift_dummy.c b/src/effects/pitchshift_dummy.c
index a43c8cf7..ed16ca00 100644
--- a/src/effects/pitchshift_dummy.c
+++ b/src/effects/pitchshift_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/pitchshift.h"
 
diff --git a/src/effects/pitchshift_rubberband.c b/src/effects/pitchshift_rubberband.c
index 8e86bf09..f488920e 100644
--- a/src/effects/pitchshift_rubberband.c
+++ b/src/effects/pitchshift_rubberband.c
@@ -18,15 +18,14 @@
 
 */
 
-#include "config.h"
+#include "aubio_priv.h"
 
 #ifdef HAVE_RUBBERBAND
 
-#include "aubio_priv.h"
 #include "fvec.h"
 #include "effects/pitchshift.h"
 
-#include "rubberband/rubberband-c.h"
+#include <rubberband/rubberband-c.h>
 
 /** generic pitch shifting structure */
 struct _aubio_pitchshift_t
diff --git a/src/effects/rubberband_utils.c b/src/effects/rubberband_utils.c
index 11c51626..d8d039e3 100644
--- a/src/effects/rubberband_utils.c
+++ b/src/effects/rubberband_utils.c
@@ -1,11 +1,10 @@
 
 
-#include "config.h"
 #include "aubio_priv.h"
 
 #ifdef HAVE_RUBBERBAND
 
-#include "rubberband/rubberband-c.h"
+#include <rubberband/rubberband-c.h>
 
 // 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 <rubberband/rubberband-c.h>
 
 #define MIN_STRETCH_RATIO 0.025
 #define MAX_STRETCH_RATIO 40.