Commit d4798adc authored by David Reid's avatar David Reid

Initial work on the MP3 decoder.

This currently uses minimp3, but this may change.
parent 9eb2b353
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
// These are implemented at the bottom of this file. // These are implemented at the bottom of this file.
#define STB_VORBIS_HEADER_ONLY //#define STB_VORBIS_HEADER_ONLY
#include "../extras/stb_vorbis.c" //#include "../extras/stb_vorbis.c"
#include "../extras/dr_flac.h" #include "../extras/dr_flac.h"
#include "../extras/dr_wav.h" #include "../extras/dr_wav.h"
#include "../extras/jar_mod.h" #include "../extras/jar_mod.h"
#include "../extras/jar_xm.h" #include "../extras/jar_xm.h"
#if defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable:4244)
#endif
#define MINIMP3_IMPLEMENTATION
#include "../extras/minimp3.h"
#if defined(_MSC_VER)
#pragma warning(pop)
#pragma warning(disable:4244)
#endif
#define MAL_IMPLEMENTATION #define MAL_IMPLEMENTATION
#include "../mini_al.h" #include "../mini_al.h"
...@@ -254,7 +266,7 @@ end:; ...@@ -254,7 +266,7 @@ end:;
#endif #endif
#endif #endif
#undef STB_VORBIS_HEADER_ONLY #undef STB_VORBIS_HEADER_ONLY
#include "../extras/stb_vorbis.c" //#include "../extras/stb_vorbis.c"
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(pop) #pragma warning(pop)
#endif #endif
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment