projects
/
aubio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
671eae1
)
src/aubio_priv.h: move include config.h here
author
Paul Brossier
<piem@piem.org>
Sun, 11 Dec 2016 23:25:07 +0000
(
00:25
+0100)
committer
Paul Brossier
<piem@piem.org>
Sun, 11 Dec 2016 23:25:07 +0000
(
00:25
+0100)
23 files changed:
src/aubio_priv.h
patch
|
blob
|
history
src/io/audio_unit.c
patch
|
blob
|
history
src/io/ioutils.c
patch
|
blob
|
history
src/io/sink.c
patch
|
blob
|
history
src/io/sink_apple_audio.c
patch
|
blob
|
history
src/io/sink_sndfile.c
patch
|
blob
|
history
src/io/sink_wavwrite.c
patch
|
blob
|
history
src/io/source.c
patch
|
blob
|
history
src/io/source_apple_audio.c
patch
|
blob
|
history
src/io/source_avcodec.c
patch
|
blob
|
history
src/io/source_sndfile.c
patch
|
blob
|
history
src/io/source_wavread.c
patch
|
blob
|
history
src/io/utils_apple_audio.c
patch
|
blob
|
history
src/mathutils.c
patch
|
blob
|
history
src/synth/sampler.c
patch
|
blob
|
history
src/synth/wavetable.c
patch
|
blob
|
history
src/temporal/resampler.c
patch
|
blob
|
history
src/utils/log.c
patch
|
blob
|
history
src/utils/parameter.c
patch
|
blob
|
history
src/utils/windll.c
patch
|
blob
|
history
src/vecutils.c
patch
|
blob
|
history
tests/src/io/test-sink_sndfile-multi.c
patch
|
blob
|
history
tests/src/io/test-sink_sndfile.c
patch
|
blob
|
history
diff --git
a/src/aubio_priv.h
b/src/aubio_priv.h
index
9e0d0c6
..
2f12d8b
100644
(file)
--- a/
src/aubio_priv.h
+++ b/
src/aubio_priv.h
@@
-33,7
+33,9
@@
*
*/
*
*/
+#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config.h"
+#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
diff --git
a/src/io/audio_unit.c
b/src/io/audio_unit.c
index
a21906a
..
2674388
100644
(file)
--- 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"
#include "aubio_priv.h"
+#ifdef HAVE_AUDIO_UNIT
#include "fvec.h"
#include "fmat.h"
#include "fvec.h"
#include "fmat.h"
diff --git
a/src/io/ioutils.c
b/src/io/ioutils.c
index
31bc246
..
cce93c6
100644
(file)
--- a/
src/io/ioutils.c
+++ b/
src/io/ioutils.c
@@
-18,7
+18,6
@@
*/
*/
-#include "config.h"
#include "aubio_priv.h"
uint_t
#include "aubio_priv.h"
uint_t
diff --git
a/src/io/sink.c
b/src/io/sink.c
index
9fecef7
..
e86d085
100644
(file)
--- 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"
#include "aubio_priv.h"
#include "fvec.h"
#include "fmat.h"
diff --git
a/src/io/sink_apple_audio.c
b/src/io/sink_apple_audio.c
index
f83c3da
..
32fbbf4
100644
(file)
--- 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
#ifdef HAVE_SINK_APPLE_AUDIO
-
-#include "aubio_priv.h"
#include "fvec.h"
#include "fmat.h"
#include "io/sink_apple_audio.h"
#include "fvec.h"
#include "fmat.h"
#include "io/sink_apple_audio.h"
diff --git
a/src/io/sink_sndfile.c
b/src/io/sink_sndfile.c
index
562b327
..
c105221
100644
(file)
--- 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>
#ifdef HAVE_SNDFILE
#include <sndfile.h>
-#include "aubio_priv.h"
#include "fvec.h"
#include "fmat.h"
#include "io/sink_sndfile.h"
#include "fvec.h"
#include "fmat.h"
#include "io/sink_sndfile.h"
diff --git
a/src/io/sink_wavwrite.c
b/src/io/sink_wavwrite.c
index
a108a2f
..
2e456ea
100644
(file)
--- 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
#ifdef HAVE_WAVWRITE
-#include "aubio_priv.h"
#include "fvec.h"
#include "fmat.h"
#include "io/sink_wavwrite.h"
#include "fvec.h"
#include "fmat.h"
#include "io/sink_wavwrite.h"
diff --git
a/src/io/source.c
b/src/io/source.c
index
3862d71
..
7f4049a
100644
(file)
--- 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"
#include "aubio_priv.h"
#include "fvec.h"
#include "fmat.h"
diff --git
a/src/io/source_apple_audio.c
b/src/io/source_apple_audio.c
index
a86d4a3
..
715a7e3
100644
(file)
--- 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
#ifdef HAVE_SOURCE_APPLE_AUDIO
-#include "aubio_priv.h"
#include "fvec.h"
#include "fmat.h"
#include "io/source_apple_audio.h"
#include "fvec.h"
#include "fmat.h"
#include "io/source_apple_audio.h"
diff --git
a/src/io/source_avcodec.c
b/src/io/source_avcodec.c
index
f14fa76
..
7d0a9b7
100644
(file)
--- 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
#ifdef HAVE_LIBAV
diff --git
a/src/io/source_sndfile.c
b/src/io/source_sndfile.c
index
20cdb8b
..
2f09d13
100644
(file)
--- a/
src/io/source_sndfile.c
+++ b/
src/io/source_sndfile.c
@@
-18,14
+18,12
@@
*/
*/
-
-#include "config.h"
+#include "aubio_priv.h"
#ifdef HAVE_SNDFILE
#include <sndfile.h>
#ifdef HAVE_SNDFILE
#include <sndfile.h>
-#include "aubio_priv.h"
#include "fvec.h"
#include "fmat.h"
#include "source_sndfile.h"
#include "fvec.h"
#include "fmat.h"
#include "source_sndfile.h"
diff --git
a/src/io/source_wavread.c
b/src/io/source_wavread.c
index
a361b95
..
9ab9b9d
100644
(file)
--- 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
#ifdef HAVE_WAVREAD
-#include "aubio_priv.h"
#include "fvec.h"
#include "fmat.h"
#include "source_wavread.h"
#include "fvec.h"
#include "fmat.h"
#include "source_wavread.h"
diff --git
a/src/io/utils_apple_audio.c
b/src/io/utils_apple_audio.c
index
2e651d5
..
34c3578
100644
(file)
--- 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)
#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 <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);
int createAubioBufferList(AudioBufferList *bufferList, int channels, int segmentSize);
void freeAudioBufferList(AudioBufferList *bufferList);
diff --git
a/src/mathutils.c
b/src/mathutils.c
index
01b3519
..
45f61c9
100644
(file)
--- a/
src/mathutils.c
+++ b/
src/mathutils.c
@@
-24,7
+24,6
@@
#include "fvec.h"
#include "mathutils.h"
#include "musicutils.h"
#include "fvec.h"
#include "mathutils.h"
#include "musicutils.h"
-#include "config.h"
/** Window types */
typedef enum
/** Window types */
typedef enum
diff --git
a/src/synth/sampler.c
b/src/synth/sampler.c
index
7df1b5f
..
050f008
100644
(file)
--- 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"
#include "aubio_priv.h"
#include "fvec.h"
#include "fmat.h"
diff --git
a/src/synth/wavetable.c
b/src/synth/wavetable.c
index
830ffd7
..
8dacde3
100644
(file)
--- 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"
#include "aubio_priv.h"
#include "fvec.h"
#include "fmat.h"
diff --git
a/src/temporal/resampler.c
b/src/temporal/resampler.c
index
cd12849
..
adfb08f
100644
(file)
--- 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"
#include "aubio_priv.h"
#include "fvec.h"
#include "temporal/resampler.h"
diff --git
a/src/utils/log.c
b/src/utils/log.c
index
634178d
..
55aa993
100644
(file)
--- a/
src/utils/log.c
+++ b/
src/utils/log.c
@@
-18,7
+18,6
@@
*/
*/
-#include "config.h"
#include "aubio_priv.h"
#include "log.h"
#include "aubio_priv.h"
#include "log.h"
diff --git
a/src/utils/parameter.c
b/src/utils/parameter.c
index
f8a8b45
..
00b3979
100644
(file)
--- a/
src/utils/parameter.c
+++ b/
src/utils/parameter.c
@@
-18,7
+18,6
@@
*/
*/
-#include "config.h"
#include "aubio_priv.h"
#include "parameter.h"
#include "aubio_priv.h"
#include "parameter.h"
diff --git
a/src/utils/windll.c
b/src/utils/windll.c
index
7c11af6
..
fce588e
100644
(file)
--- 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
#ifdef HAVE_WIN_HACKS
diff --git
a/src/vecutils.c
b/src/vecutils.c
index
8e49f96
..
8907b5e
100644
(file)
--- 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"
#include "aubio_priv.h"
#include "types.h"
#include "fvec.h"
diff --git
a/tests/src/io/test-sink_sndfile-multi.c
b/tests/src/io/test-sink_sndfile-multi.c
index
4dcc690
..
46882f6
100644
(file)
--- 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>
#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
#include "utils_tests.h"
// this file uses the unstable aubio api, please use aubio_sink instead
diff --git
a/tests/src/io/test-sink_sndfile.c
b/tests/src/io/test-sink_sndfile.c
index
7812229
..
fe95310
100644
(file)
--- 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>
#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
#include "utils_tests.h"
// this file uses the unstable aubio api, please use aubio_sink instead