From b93faa46e527cc4747c8b33f93f889ad9858ae6d Mon Sep 17 00:00:00 2001 From: David Reid Date: Wed, 6 Mar 2019 20:49:18 +1000 Subject: [PATCH] MINI_AL_IMPLEMENTATION to MINIAUDIO_IMPLEMENTATION. --- README.md | 6 +++--- examples/advanced_config.c | 2 +- examples/simple_capture.c | 2 +- examples/simple_enumeration.c | 2 +- examples/simple_playback.c | 2 +- examples/simple_playback_emscripten.c | 2 +- miniaudio.h | 6 +++--- research/mal_resampler.h | 2 +- research/mal_ring_buffer.h | 4 ++-- research/tests/mal_resampler_test_0.c | 2 +- tests/mal_debug_playback.c | 2 +- tests/mal_dithering.c | 2 +- tests/mal_duplex.c | 2 +- tests/mal_no_device_io.c | 2 +- tests/mal_profiling.c | 2 +- tests/mal_resampling.c | 2 +- tests/mal_stop.c | 2 +- tests/mal_test_0.c | 2 +- tools/mini_sigvis/mini_sigvis.h | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index ca1c75be..1a88500d 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Building ====== Do the following in one source file: ``` -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "miniaudio.h" ``` Then just compile. There's no need to install any dependencies. On Windows and macOS there's no need to link @@ -69,7 +69,7 @@ Simple Playback Example #define DR_WAV_IMPLEMENTATION #include "../extras/dr_wav.h" // Enables WAV decoding. -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "../miniaudio.h" #include @@ -154,7 +154,7 @@ relevant backend library before the implementation of miniaudio, like so: #include "dr_mp3.h" // Enables MP3 decoding. #include "dr_wav.h" // Enables WAV decoding. -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "miniaudio.h" ``` diff --git a/examples/advanced_config.c b/examples/advanced_config.c index a4ddd667..545aba74 100644 --- a/examples/advanced_config.c +++ b/examples/advanced_config.c @@ -1,4 +1,4 @@ -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "../miniaudio.h" #include diff --git a/examples/simple_capture.c b/examples/simple_capture.c index 1649a33a..63e1fad2 100644 --- a/examples/simple_capture.c +++ b/examples/simple_capture.c @@ -1,6 +1,6 @@ // This example simply captures data from your default microphone until you press Enter. The output is saved to the file specified on the command line. -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "../miniaudio.h" #define DR_WAV_IMPLEMENTATION diff --git a/examples/simple_enumeration.c b/examples/simple_enumeration.c index f3db1ee2..c208693e 100644 --- a/examples/simple_enumeration.c +++ b/examples/simple_enumeration.c @@ -1,4 +1,4 @@ -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "../miniaudio.h" #include diff --git a/examples/simple_playback.c b/examples/simple_playback.c index fb470789..7a79f546 100644 --- a/examples/simple_playback.c +++ b/examples/simple_playback.c @@ -5,7 +5,7 @@ #define DR_WAV_IMPLEMENTATION #include "../extras/dr_wav.h" // Enables WAV decoding. -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "../miniaudio.h" #include diff --git a/examples/simple_playback_emscripten.c b/examples/simple_playback_emscripten.c index 51cda86b..b3f68700 100644 --- a/examples/simple_playback_emscripten.c +++ b/examples/simple_playback_emscripten.c @@ -1,4 +1,4 @@ -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "../miniaudio.h" #include diff --git a/miniaudio.h b/miniaudio.h index 96355ed0..97a20eec 100644 --- a/miniaudio.h +++ b/miniaudio.h @@ -154,7 +154,7 @@ Supported Formats: USAGE ===== miniaudio is a single-file library. To use it, do something like the following in one .c file. - #define MINI_AL_IMPLEMENTATION + #define MINIAUDIO_IMPLEMENTATION #include "miniaudio.h" You can then #include this file in other parts of the program as you would with any other header file. @@ -2951,7 +2951,7 @@ mal_uint64 mal_sine_wave_read_f32_ex(mal_sine_wave* pSineWave, mal_uint64 frameC // ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#if defined(MINI_AL_IMPLEMENTATION) || defined(MAL_IMPLEMENTATION) +#if defined(MINIAUDIO_IMPLEMENTATION) #include #include // For INT_MAX #include // sin(), etc. @@ -31305,7 +31305,7 @@ mal_uint64 mal_sine_wave_read_f32_ex(mal_sine_wave* pSineWave, mal_uint64 frameC #pragma warning(pop) #endif -#endif /* MINI_AL_IMPLEMENTATION */ +#endif /* MINIAUDIO_IMPLEMENTATION */ /* BACKEND IMPLEMENTATION GUIDLINES diff --git a/research/mal_resampler.h b/research/mal_resampler.h index 09bcd066..23a6541d 100644 --- a/research/mal_resampler.h +++ b/research/mal_resampler.h @@ -220,7 +220,7 @@ window are not included in the calculation. mal_uint64 mal_resampler_get_expected_output_frame_count(mal_resampler* pResampler, mal_uint64 inputFrameCount); #endif -#ifdef MINI_AL_IMPLEMENTATION +#ifdef MINIAUDIO_IMPLEMENTATION #ifndef MAL_RESAMPLER_MIN_RATIO #define MAL_RESAMPLER_MIN_RATIO 0.02083333 diff --git a/research/mal_ring_buffer.h b/research/mal_ring_buffer.h index 842cdb7f..93ce9ee5 100644 --- a/research/mal_ring_buffer.h +++ b/research/mal_ring_buffer.h @@ -99,7 +99,7 @@ void* mal_pcm_rb_get_subbuffer_ptr(mal_pcm_rb* pRB, size_t subbufferIndex, void* #endif // mal_ring_buffer_h -#ifdef MINI_AL_IMPLEMENTATION +#ifdef MINIAUDIO_IMPLEMENTATION MAL_INLINE mal_uint32 mal_rb__extract_offset_in_bytes(mal_uint32 encodedOffset) { return encodedOffset & 0x7FFFFFFF; @@ -634,4 +634,4 @@ void* mal_pcm_rb_get_subbuffer_ptr(mal_pcm_rb* pRB, size_t subbufferIndex, void* return mal_rb_get_subbuffer_ptr(&pRB->rb, subbufferIndex, pBuffer); } -#endif // MINI_AL_IMPLEMENTATION +#endif // MINIAUDIO_IMPLEMENTATION diff --git a/research/tests/mal_resampler_test_0.c b/research/tests/mal_resampler_test_0.c index 7d1c1991..eeaf4d16 100644 --- a/research/tests/mal_resampler_test_0.c +++ b/research/tests/mal_resampler_test_0.c @@ -2,7 +2,7 @@ #include "../../../../dr_libs/dr_wav.h" #define MAL_DEBUG_OUTPUT -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "../../miniaudio.h" #include "../mal_resampler.h" diff --git a/tests/mal_debug_playback.c b/tests/mal_debug_playback.c index 816b3890..d0519137 100644 --- a/tests/mal_debug_playback.c +++ b/tests/mal_debug_playback.c @@ -1,7 +1,7 @@ #define MAL_LOG_LEVEL MAL_LOG_LEVEL_VERBOSE #define MAL_DEBUG_OUTPUT -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "../miniaudio.h" int print_context_info(mal_context* pContext) diff --git a/tests/mal_dithering.c b/tests/mal_dithering.c index 11c06aab..72f1166c 100644 --- a/tests/mal_dithering.c +++ b/tests/mal_dithering.c @@ -1,6 +1,6 @@ #define MAL_DEBUG_OUTPUT #define MAL_USE_REFERENCE_CONVERSION_APIS -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "../miniaudio.h" // Two converters are needed here. One for converting f32 samples from the sine wave generator to the input format, diff --git a/tests/mal_duplex.c b/tests/mal_duplex.c index 5d29c960..56668a7a 100644 --- a/tests/mal_duplex.c +++ b/tests/mal_duplex.c @@ -1,7 +1,7 @@ #include #define MAL_DEBUG_OUTPUT -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "../miniaudio.h" #define DR_WAV_IMPLEMENTATION diff --git a/tests/mal_no_device_io.c b/tests/mal_no_device_io.c index 01c6cffd..d6435b78 100644 --- a/tests/mal_no_device_io.c +++ b/tests/mal_no_device_io.c @@ -5,7 +5,7 @@ #include "../extras/dr_wav.h" #define MAL_NO_DEVICE_IO -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "../miniaudio.h" int main(int argc, char** argv) diff --git a/tests/mal_profiling.c b/tests/mal_profiling.c index 882d0208..4732e0e2 100644 --- a/tests/mal_profiling.c +++ b/tests/mal_profiling.c @@ -1,4 +1,4 @@ -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "../miniaudio.h" typedef enum diff --git a/tests/mal_resampling.c b/tests/mal_resampling.c index c16af931..b0e3947e 100644 --- a/tests/mal_resampling.c +++ b/tests/mal_resampling.c @@ -5,7 +5,7 @@ #define MAL_NO_AVX2 #ifdef NO_SIGVIS - #define MINI_AL_IMPLEMENTATION + #define MINIAUDIO_IMPLEMENTATION #include "../miniaudio.h" #else #define MINI_SIGVIS_IMPLEMENTATION diff --git a/tests/mal_stop.c b/tests/mal_stop.c index b5dc69f8..f83637b9 100644 --- a/tests/mal_stop.c +++ b/tests/mal_stop.c @@ -1,6 +1,6 @@ #include -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "../miniaudio.h" mal_sine_wave sineWave; diff --git a/tests/mal_test_0.c b/tests/mal_test_0.c index 87b8e493..5e1dface 100644 --- a/tests/mal_test_0.c +++ b/tests/mal_test_0.c @@ -11,7 +11,7 @@ #endif //#define MAL_DEBUG_OUTPUT -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "../miniaudio.h" #ifdef __EMSCRIPTEN__ diff --git a/tools/mini_sigvis/mini_sigvis.h b/tools/mini_sigvis/mini_sigvis.h index 05ab3293..615eac7b 100644 --- a/tools/mini_sigvis/mini_sigvis.h +++ b/tools/mini_sigvis/mini_sigvis.h @@ -82,7 +82,7 @@ float msigvis_channel_get_sample_f32(msigvis_channel* pChannel, mal_uint32 iSamp ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #ifdef MINI_SIGVIS_IMPLEMENTATION -#define MINI_AL_IMPLEMENTATION +#define MINIAUDIO_IMPLEMENTATION #include "../../miniaudio.h" #include "../external/dred/source/dred/dtk/dtk.c"