From 400ca25a9053dd1012cd452926da0799481452bd Mon Sep 17 00:00:00 2001 From: David Reid Date: Sat, 24 Feb 2018 09:32:33 +1000 Subject: [PATCH] Minor clean up to the multi_playback example. --- examples/multi_playback.c | 87 +++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 36 deletions(-) diff --git a/examples/multi_playback.c b/examples/multi_playback.c index d8194f3a..01cad732 100644 --- a/examples/multi_playback.c +++ b/examples/multi_playback.c @@ -6,49 +6,17 @@ #define DR_WAV_IMPLEMENTATION #include "../extras/dr_wav.h" -#if defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable:4456) - #pragma warning(disable:4457) - #pragma warning(disable:4100) - #pragma warning(disable:4244) - #pragma warning(disable:4701) - #pragma warning(disable:4245) -#endif -#if defined(__GNUC__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wunused-value" - #pragma GCC diagnostic ignored "-Wunused-parameter" - #ifndef __clang__ - #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" - #endif -#endif -#undef STB_VORBIS_HEADER_ONLY + +#define STB_VORBIS_HEADER_ONLY #include "../extras/stb_vorbis.c" -#if defined(_MSC_VER) - #pragma warning(pop) -#endif -#if defined(__GNUC__) - #pragma GCC diagnostic pop -#endif +#include "../extras/jar_mod.h" #if defined(_MSC_VER) #pragma warning(push) - #pragma warning(disable:4100) #pragma warning(disable:4244) #pragma warning(disable:4018) - #pragma warning(disable:4456) - #pragma warning(disable:4701) - #pragma warning(disable:4702) - #pragma warning(disable:4706) - #pragma warning(disable:4127) #endif -#define JAR_MOD_IMPLEMENTATION -#include "../extras/jar_mod.h" -#undef DEBUG - -#define JAR_XM_IMPLEMENTATION #include "../extras/jar_xm.h" #if defined(_MSC_VER) #pragma warning(pop) @@ -83,7 +51,6 @@ int main(int argc, char** argv) } - mal_context context; if (mal_context_init(NULL, 0, NULL, &context) != MAL_SUCCESS) { printf("Failed to initialize context.\n"); @@ -276,3 +243,51 @@ end:; return exitcode; } #endif + + +#if defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable:4456) + #pragma warning(disable:4457) + #pragma warning(disable:4100) + #pragma warning(disable:4244) + #pragma warning(disable:4701) + #pragma warning(disable:4245) +#endif +#if defined(__GNUC__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wunused-value" + #pragma GCC diagnostic ignored "-Wunused-parameter" + #ifndef __clang__ + #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" + #endif +#endif +#undef STB_VORBIS_HEADER_ONLY +#include "../extras/stb_vorbis.c" +#if defined(_MSC_VER) + #pragma warning(pop) +#endif +#if defined(__GNUC__) + #pragma GCC diagnostic pop +#endif + +#if defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable:4100) + #pragma warning(disable:4244) + #pragma warning(disable:4018) + #pragma warning(disable:4456) + #pragma warning(disable:4701) + #pragma warning(disable:4702) + #pragma warning(disable:4706) + #pragma warning(disable:4127) +#endif +#define JAR_MOD_IMPLEMENTATION +#include "../extras/jar_mod.h" +#undef DEBUG + +#define JAR_XM_IMPLEMENTATION +#include "../extras/jar_xm.h" +#if defined(_MSC_VER) + #pragma warning(pop) +#endif \ No newline at end of file