shithub: aubio

Info  •  Files  •  Log  •  Branches

src/aubio_priv.h: move include config.h here

--- a/src/aubio_priv.h

+++ b/src/aubio_priv.h

@@ -33,7 +33,9 @@

  *

  */

+#ifdef HAVE_CONFIG_H

 #include "config.h"

+#endif

 #ifdef HAVE_STDLIB_H

 #include <stdlib.h>

--- a/src/io/audio_unit.c

+++ b/src/io/audio_unit.c

@@ -18,9 +18,8 @@

 */

-#include "config.h"

-#ifdef HAVE_AUDIO_UNIT

 #include "aubio_priv.h"

+#ifdef HAVE_AUDIO_UNIT

 #include "fvec.h"

 #include "fmat.h"

--- a/src/io/ioutils.c

+++ b/src/io/ioutils.c

@@ -18,7 +18,6 @@

 */

-#include "config.h"

 #include "aubio_priv.h"

 uint_t

--- a/src/io/sink.c

+++ b/src/io/sink.c

@@ -18,7 +18,6 @@

 */

-#include "config.h"

 #include "aubio_priv.h"

 #include "fvec.h"

 #include "fmat.h"

--- a/src/io/sink_apple_audio.c

+++ b/src/io/sink_apple_audio.c

@@ -18,11 +18,9 @@

 */

-#include "config.h"

+#include "aubio_priv.h"

 #ifdef HAVE_SINK_APPLE_AUDIO

-

-#include "aubio_priv.h"

 #include "fvec.h"

 #include "fmat.h"

 #include "io/sink_apple_audio.h"

--- a/src/io/sink_sndfile.c

+++ b/src/io/sink_sndfile.c

@@ -19,13 +19,12 @@

 */

-#include "config.h"

+#include "aubio_priv.h"

 #ifdef HAVE_SNDFILE

 #include <sndfile.h>

-#include "aubio_priv.h"

 #include "fvec.h"

 #include "fmat.h"

 #include "io/sink_sndfile.h"

--- a/src/io/sink_wavwrite.c

+++ b/src/io/sink_wavwrite.c

@@ -19,11 +19,10 @@

 */

-#include "config.h"

+#include "aubio_priv.h"

 #ifdef HAVE_WAVWRITE

-#include "aubio_priv.h"

 #include "fvec.h"

 #include "fmat.h"

 #include "io/sink_wavwrite.h"

--- a/src/io/source.c

+++ b/src/io/source.c

@@ -18,7 +18,6 @@

 */

-#include "config.h"

 #include "aubio_priv.h"

 #include "fvec.h"

 #include "fmat.h"

--- a/src/io/source_apple_audio.c

+++ b/src/io/source_apple_audio.c

@@ -18,11 +18,10 @@

 */

-#include "config.h"

+#include "aubio_priv.h"

 #ifdef HAVE_SOURCE_APPLE_AUDIO

-#include "aubio_priv.h"

 #include "fvec.h"

 #include "fmat.h"

 #include "io/source_apple_audio.h"

--- a/src/io/source_avcodec.c

+++ b/src/io/source_avcodec.c

@@ -18,8 +18,7 @@

 */

-

-#include "config.h"

+#include "aubio_priv.h"

 #ifdef HAVE_LIBAV

--- a/src/io/source_sndfile.c

+++ b/src/io/source_sndfile.c

@@ -18,14 +18,12 @@

 */

+#include "aubio_priv.h"

-#include "config.h"

-

 #ifdef HAVE_SNDFILE

 #include <sndfile.h>

-#include "aubio_priv.h"

 #include "fvec.h"

 #include "fmat.h"

 #include "source_sndfile.h"

--- a/src/io/source_wavread.c

+++ b/src/io/source_wavread.c

@@ -18,11 +18,10 @@

 */

-#include "config.h"

+#include "aubio_priv.h"

 #ifdef HAVE_WAVREAD

-#include "aubio_priv.h"

 #include "fvec.h"

 #include "fmat.h"

 #include "source_wavread.h"

--- a/src/io/utils_apple_audio.c

+++ b/src/io/utils_apple_audio.c

@@ -1,4 +1,4 @@

-#include "config.h"

+#include "aubio_priv.h"

 #if defined(HAVE_SOURCE_APPLE_AUDIO) || defined(HAVE_SINK_APPLE_AUDIO)

@@ -6,7 +6,6 @@

 #include <CoreFoundation/CoreFoundation.h>

 // ExtAudioFileRef, AudioStreamBasicDescription, AudioBufferList, ...

 #include <AudioToolbox/AudioToolbox.h>

-#include "aubio_priv.h"

 int createAubioBufferList(AudioBufferList *bufferList, int channels, int segmentSize);

 void freeAudioBufferList(AudioBufferList *bufferList);

--- a/src/mathutils.c

+++ b/src/mathutils.c

@@ -24,7 +24,6 @@

 #include "fvec.h"

 #include "mathutils.h"

 #include "musicutils.h"

-#include "config.h"

 /** Window types */

 typedef enum

--- a/src/synth/sampler.c

+++ b/src/synth/sampler.c

@@ -19,7 +19,6 @@

 */

-#include "config.h"

 #include "aubio_priv.h"

 #include "fvec.h"

 #include "fmat.h"

--- a/src/synth/wavetable.c

+++ b/src/synth/wavetable.c

@@ -19,7 +19,6 @@

 */

-#include "config.h"

 #include "aubio_priv.h"

 #include "fvec.h"

 #include "fmat.h"

--- a/src/temporal/resampler.c

+++ b/src/temporal/resampler.c

@@ -18,8 +18,6 @@

 */

-#include "config.h"

-

 #include "aubio_priv.h"

 #include "fvec.h"

 #include "temporal/resampler.h"

--- a/src/utils/log.c

+++ b/src/utils/log.c

@@ -18,7 +18,6 @@

 */

-#include "config.h"

 #include "aubio_priv.h"

 #include "log.h"

--- a/src/utils/parameter.c

+++ b/src/utils/parameter.c

@@ -18,7 +18,6 @@

 */

-#include "config.h"

 #include "aubio_priv.h"

 #include "parameter.h"

--- a/src/utils/windll.c

+++ b/src/utils/windll.c

@@ -24,7 +24,7 @@

 */

-#include "config.h"

+#include "aubio_priv.h"

 #ifdef HAVE_WIN_HACKS

--- a/src/vecutils.c

+++ b/src/vecutils.c

@@ -1,4 +1,3 @@

-#include "config.h"

 #include "aubio_priv.h"

 #include "types.h"

 #include "fvec.h"

--- a/tests/src/io/test-sink_sndfile-multi.c

+++ b/tests/src/io/test-sink_sndfile-multi.c

@@ -1,6 +1,5 @@

 #define AUBIO_UNSTABLE 1

 #include <aubio.h>

-#include "config.h"

 #include "utils_tests.h"

 // this file uses the unstable aubio api, please use aubio_sink instead

--- a/tests/src/io/test-sink_sndfile.c

+++ b/tests/src/io/test-sink_sndfile.c

@@ -1,6 +1,5 @@

 #define AUBIO_UNSTABLE 1

 #include <aubio.h>

-#include "config.h"

 #include "utils_tests.h"

 // this file uses the unstable aubio api, please use aubio_sink instead

-- 

⑨