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 a43c8cf..ed16ca0 100644 (file)
--- 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 8e86bf0..f488920 100644 (file)
--- 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 11c5162..d8d039e 100644 (file)
--- 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 a93b594..adb8055 100644 (file)
--- 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 a2cdc29..42484c6 100644 (file)
--- 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.