From 6425fc643a9361f18b9788caa9b5ffef3e005d52 Mon Sep 17 00:00:00 2001 From: David Reid Date: Sun, 2 Aug 2020 11:53:41 +1000 Subject: [PATCH] Update dr_wav, dr_flac and dr_mp3. --- extras/dr_flac.h | 64 +++++++++--------- extras/dr_mp3.h | 64 +++++++++--------- extras/dr_wav.h | 64 +++++++++--------- miniaudio.h | 165 +++++++++++++++++++++++------------------------ 4 files changed, 180 insertions(+), 177 deletions(-) diff --git a/extras/dr_flac.h b/extras/dr_flac.h index 7ebe9e87..a78f370e 100644 --- a/extras/dr_flac.h +++ b/extras/dr_flac.h @@ -1,6 +1,6 @@ /* FLAC audio decoder. Choice of public domain or MIT-0. See license statements at the end of this file. -dr_flac - v0.12.16 - 2020-07-25 +dr_flac - v0.12.17 - 2020-08-02 David Reid - mackron@gmail.com @@ -232,45 +232,44 @@ extern "C" { #define DRFLAC_VERSION_MAJOR 0 #define DRFLAC_VERSION_MINOR 12 -#define DRFLAC_VERSION_REVISION 16 +#define DRFLAC_VERSION_REVISION 17 #define DRFLAC_VERSION_STRING DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MAJOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MINOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_REVISION) #include /* For size_t. */ -/* Sized types. Prefer built-in types. Fall back to stdint. */ -#ifdef _MSC_VER - #if defined(__clang__) +/* Sized types. */ +typedef signed char drflac_int8; +typedef unsigned char drflac_uint8; +typedef signed short drflac_int16; +typedef unsigned short drflac_uint16; +typedef signed int drflac_int32; +typedef unsigned int drflac_uint32; +#if defined(_MSC_VER) + typedef signed __int64 drflac_int64; + typedef unsigned __int64 drflac_uint64; +#else + #if defined(__GNUC__) #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wlanguage-extension-token" - #pragma GCC diagnostic ignored "-Wlong-long" - #pragma GCC diagnostic ignored "-Wc++11-long-long" + #pragma GCC diagnostic ignored "-Wlong-long" + #if defined(__clang__) + #pragma GCC diagnostic ignored "-Wc++11-long-long" + #endif #endif - typedef signed __int8 drflac_int8; - typedef unsigned __int8 drflac_uint8; - typedef signed __int16 drflac_int16; - typedef unsigned __int16 drflac_uint16; - typedef signed __int32 drflac_int32; - typedef unsigned __int32 drflac_uint32; - typedef signed __int64 drflac_int64; - typedef unsigned __int64 drflac_uint64; - #if defined(__clang__) + typedef signed long long drflac_int64; + typedef unsigned long long drflac_uint64; + #if defined(__GNUC__) #pragma GCC diagnostic pop #endif -#else - #include - typedef int8_t drflac_int8; - typedef uint8_t drflac_uint8; - typedef int16_t drflac_int16; - typedef uint16_t drflac_uint16; - typedef int32_t drflac_int32; - typedef uint32_t drflac_uint32; - typedef int64_t drflac_int64; - typedef uint64_t drflac_uint64; #endif -typedef drflac_uint8 drflac_bool8; -typedef drflac_uint32 drflac_bool32; -#define DRFLAC_TRUE 1 -#define DRFLAC_FALSE 0 +#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) + typedef drflac_uint64 drflac_uintptr; +#else + typedef drflac_uint32 drflac_uintptr; +#endif +typedef drflac_uint8 drflac_bool8; +typedef drflac_uint32 drflac_bool32; +#define DRFLAC_TRUE 1 +#define DRFLAC_FALSE 0 #if !defined(DRFLAC_API) #if defined(DRFLAC_DLL) @@ -11752,6 +11751,9 @@ DRFLAC_API drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterat /* REVISION HISTORY ================ +v0.12.17 - 2020-08-02 + - Simplify sized types. + v0.12.16 - 2020-07-25 - Fix a compilation warning. diff --git a/extras/dr_mp3.h b/extras/dr_mp3.h index 8a87c236..a8e52e58 100644 --- a/extras/dr_mp3.h +++ b/extras/dr_mp3.h @@ -1,6 +1,6 @@ /* MP3 audio decoder. Choice of public domain or MIT-0. See license statements at the end of this file. -dr_mp3 - v0.6.15 - 2020-07-25 +dr_mp3 - v0.6.16 - 2020-08-02 David Reid - mackron@gmail.com @@ -95,45 +95,44 @@ extern "C" { #define DRMP3_VERSION_MAJOR 0 #define DRMP3_VERSION_MINOR 6 -#define DRMP3_VERSION_REVISION 15 +#define DRMP3_VERSION_REVISION 16 #define DRMP3_VERSION_STRING DRMP3_XSTRINGIFY(DRMP3_VERSION_MAJOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_MINOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_REVISION) #include /* For size_t. */ -/* Sized types. Prefer built-in types. Fall back to stdint. */ -#ifdef _MSC_VER - #if defined(__clang__) +/* Sized types. */ +typedef signed char drmp3_int8; +typedef unsigned char drmp3_uint8; +typedef signed short drmp3_int16; +typedef unsigned short drmp3_uint16; +typedef signed int drmp3_int32; +typedef unsigned int drmp3_uint32; +#if defined(_MSC_VER) + typedef signed __int64 drmp3_int64; + typedef unsigned __int64 drmp3_uint64; +#else + #if defined(__GNUC__) #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wlanguage-extension-token" - #pragma GCC diagnostic ignored "-Wlong-long" - #pragma GCC diagnostic ignored "-Wc++11-long-long" + #pragma GCC diagnostic ignored "-Wlong-long" + #if defined(__clang__) + #pragma GCC diagnostic ignored "-Wc++11-long-long" + #endif #endif - typedef signed __int8 drmp3_int8; - typedef unsigned __int8 drmp3_uint8; - typedef signed __int16 drmp3_int16; - typedef unsigned __int16 drmp3_uint16; - typedef signed __int32 drmp3_int32; - typedef unsigned __int32 drmp3_uint32; - typedef signed __int64 drmp3_int64; - typedef unsigned __int64 drmp3_uint64; - #if defined(__clang__) + typedef signed long long drmp3_int64; + typedef unsigned long long drmp3_uint64; + #if defined(__GNUC__) #pragma GCC diagnostic pop #endif -#else - #include - typedef int8_t drmp3_int8; - typedef uint8_t drmp3_uint8; - typedef int16_t drmp3_int16; - typedef uint16_t drmp3_uint16; - typedef int32_t drmp3_int32; - typedef uint32_t drmp3_uint32; - typedef int64_t drmp3_int64; - typedef uint64_t drmp3_uint64; #endif -typedef drmp3_uint8 drmp3_bool8; -typedef drmp3_uint32 drmp3_bool32; -#define DRMP3_TRUE 1 -#define DRMP3_FALSE 0 +#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) + typedef drmp3_uint64 drmp3_uintptr; +#else + typedef drmp3_uint32 drmp3_uintptr; +#endif +typedef drmp3_uint8 drmp3_bool8; +typedef drmp3_uint32 drmp3_bool32; +#define DRMP3_TRUE 1 +#define DRMP3_FALSE 0 #if !defined(DRMP3_API) #if defined(DRMP3_DLL) @@ -4431,6 +4430,9 @@ counts rather than sample counts. /* REVISION HISTORY ================ +v0.6.16 - 2020-08-02 + - Simplify sized types. + v0.6.15 - 2020-07-25 - Fix a compilation warning. diff --git a/extras/dr_wav.h b/extras/dr_wav.h index 59620655..ac3e8258 100644 --- a/extras/dr_wav.h +++ b/extras/dr_wav.h @@ -1,6 +1,6 @@ /* WAV audio loader and writer. Choice of public domain or MIT-0. See license statements at the end of this file. -dr_wav - v0.12.8 - 2020-07-25 +dr_wav - v0.12.9 - 2020-08-02 David Reid - mackron@gmail.com @@ -144,45 +144,44 @@ extern "C" { #define DRWAV_VERSION_MAJOR 0 #define DRWAV_VERSION_MINOR 12 -#define DRWAV_VERSION_REVISION 8 +#define DRWAV_VERSION_REVISION 9 #define DRWAV_VERSION_STRING DRWAV_XSTRINGIFY(DRWAV_VERSION_MAJOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_MINOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_REVISION) #include /* For size_t. */ -/* Sized types. Prefer built-in types. Fall back to stdint. */ -#ifdef _MSC_VER - #if defined(__clang__) +/* Sized types. */ +typedef signed char drwav_int8; +typedef unsigned char drwav_uint8; +typedef signed short drwav_int16; +typedef unsigned short drwav_uint16; +typedef signed int drwav_int32; +typedef unsigned int drwav_uint32; +#if defined(_MSC_VER) + typedef signed __int64 drwav_int64; + typedef unsigned __int64 drwav_uint64; +#else + #if defined(__GNUC__) #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wlanguage-extension-token" - #pragma GCC diagnostic ignored "-Wlong-long" - #pragma GCC diagnostic ignored "-Wc++11-long-long" + #pragma GCC diagnostic ignored "-Wlong-long" + #if defined(__clang__) + #pragma GCC diagnostic ignored "-Wc++11-long-long" + #endif #endif - typedef signed __int8 drwav_int8; - typedef unsigned __int8 drwav_uint8; - typedef signed __int16 drwav_int16; - typedef unsigned __int16 drwav_uint16; - typedef signed __int32 drwav_int32; - typedef unsigned __int32 drwav_uint32; - typedef signed __int64 drwav_int64; - typedef unsigned __int64 drwav_uint64; - #if defined(__clang__) + typedef signed long long drwav_int64; + typedef unsigned long long drwav_uint64; + #if defined(__GNUC__) #pragma GCC diagnostic pop #endif -#else - #include - typedef int8_t drwav_int8; - typedef uint8_t drwav_uint8; - typedef int16_t drwav_int16; - typedef uint16_t drwav_uint16; - typedef int32_t drwav_int32; - typedef uint32_t drwav_uint32; - typedef int64_t drwav_int64; - typedef uint64_t drwav_uint64; #endif -typedef drwav_uint8 drwav_bool8; -typedef drwav_uint32 drwav_bool32; -#define DRWAV_TRUE 1 -#define DRWAV_FALSE 0 +#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) + typedef drwav_uint64 drwav_uintptr; +#else + typedef drwav_uint32 drwav_uintptr; +#endif +typedef drwav_uint8 drwav_bool8; +typedef drwav_uint32 drwav_bool32; +#define DRWAV_TRUE 1 +#define DRWAV_FALSE 0 #if !defined(DRWAV_API) #if defined(DRWAV_DLL) @@ -5926,6 +5925,9 @@ two different ways to initialize a drwav object. /* REVISION HISTORY ================ +v0.12.9 - 2020-08-02 + - Simplify sized types. + v0.12.8 - 2020-07-25 - Fix a compilation warning. diff --git a/miniaudio.h b/miniaudio.h index b067a089..0f96c944 100644 --- a/miniaudio.h +++ b/miniaudio.h @@ -42437,42 +42437,41 @@ extern "C" { #define DRWAV_XSTRINGIFY(x) DRWAV_STRINGIFY(x) #define DRWAV_VERSION_MAJOR 0 #define DRWAV_VERSION_MINOR 12 -#define DRWAV_VERSION_REVISION 8 +#define DRWAV_VERSION_REVISION 9 #define DRWAV_VERSION_STRING DRWAV_XSTRINGIFY(DRWAV_VERSION_MAJOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_MINOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_REVISION) #include -#ifdef _MSC_VER - #if defined(__clang__) +typedef signed char drwav_int8; +typedef unsigned char drwav_uint8; +typedef signed short drwav_int16; +typedef unsigned short drwav_uint16; +typedef signed int drwav_int32; +typedef unsigned int drwav_uint32; +#if defined(_MSC_VER) + typedef signed __int64 drwav_int64; + typedef unsigned __int64 drwav_uint64; +#else + #if defined(__GNUC__) #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wlanguage-extension-token" #pragma GCC diagnostic ignored "-Wlong-long" - #pragma GCC diagnostic ignored "-Wc++11-long-long" + #if defined(__clang__) + #pragma GCC diagnostic ignored "-Wc++11-long-long" + #endif #endif - typedef signed __int8 drwav_int8; - typedef unsigned __int8 drwav_uint8; - typedef signed __int16 drwav_int16; - typedef unsigned __int16 drwav_uint16; - typedef signed __int32 drwav_int32; - typedef unsigned __int32 drwav_uint32; - typedef signed __int64 drwav_int64; - typedef unsigned __int64 drwav_uint64; - #if defined(__clang__) + typedef signed long long drwav_int64; + typedef unsigned long long drwav_uint64; + #if defined(__GNUC__) #pragma GCC diagnostic pop #endif -#else - #include - typedef int8_t drwav_int8; - typedef uint8_t drwav_uint8; - typedef int16_t drwav_int16; - typedef uint16_t drwav_uint16; - typedef int32_t drwav_int32; - typedef uint32_t drwav_uint32; - typedef int64_t drwav_int64; - typedef uint64_t drwav_uint64; #endif -typedef drwav_uint8 drwav_bool8; -typedef drwav_uint32 drwav_bool32; -#define DRWAV_TRUE 1 -#define DRWAV_FALSE 0 +#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) + typedef drwav_uint64 drwav_uintptr; +#else + typedef drwav_uint32 drwav_uintptr; +#endif +typedef drwav_uint8 drwav_bool8; +typedef drwav_uint32 drwav_bool32; +#define DRWAV_TRUE 1 +#define DRWAV_FALSE 0 #if !defined(DRWAV_API) #if defined(DRWAV_DLL) #if defined(_WIN32) @@ -42810,42 +42809,41 @@ extern "C" { #define DRFLAC_XSTRINGIFY(x) DRFLAC_STRINGIFY(x) #define DRFLAC_VERSION_MAJOR 0 #define DRFLAC_VERSION_MINOR 12 -#define DRFLAC_VERSION_REVISION 16 +#define DRFLAC_VERSION_REVISION 17 #define DRFLAC_VERSION_STRING DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MAJOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MINOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_REVISION) #include -#ifdef _MSC_VER - #if defined(__clang__) +typedef signed char drflac_int8; +typedef unsigned char drflac_uint8; +typedef signed short drflac_int16; +typedef unsigned short drflac_uint16; +typedef signed int drflac_int32; +typedef unsigned int drflac_uint32; +#if defined(_MSC_VER) + typedef signed __int64 drflac_int64; + typedef unsigned __int64 drflac_uint64; +#else + #if defined(__GNUC__) #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wlanguage-extension-token" #pragma GCC diagnostic ignored "-Wlong-long" - #pragma GCC diagnostic ignored "-Wc++11-long-long" + #if defined(__clang__) + #pragma GCC diagnostic ignored "-Wc++11-long-long" + #endif #endif - typedef signed __int8 drflac_int8; - typedef unsigned __int8 drflac_uint8; - typedef signed __int16 drflac_int16; - typedef unsigned __int16 drflac_uint16; - typedef signed __int32 drflac_int32; - typedef unsigned __int32 drflac_uint32; - typedef signed __int64 drflac_int64; - typedef unsigned __int64 drflac_uint64; - #if defined(__clang__) + typedef signed long long drflac_int64; + typedef unsigned long long drflac_uint64; + #if defined(__GNUC__) #pragma GCC diagnostic pop #endif -#else - #include - typedef int8_t drflac_int8; - typedef uint8_t drflac_uint8; - typedef int16_t drflac_int16; - typedef uint16_t drflac_uint16; - typedef int32_t drflac_int32; - typedef uint32_t drflac_uint32; - typedef int64_t drflac_int64; - typedef uint64_t drflac_uint64; #endif -typedef drflac_uint8 drflac_bool8; -typedef drflac_uint32 drflac_bool32; -#define DRFLAC_TRUE 1 -#define DRFLAC_FALSE 0 +#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) + typedef drflac_uint64 drflac_uintptr; +#else + typedef drflac_uint32 drflac_uintptr; +#endif +typedef drflac_uint8 drflac_bool8; +typedef drflac_uint32 drflac_bool32; +#define DRFLAC_TRUE 1 +#define DRFLAC_FALSE 0 #if !defined(DRFLAC_API) #if defined(DRFLAC_DLL) #if defined(_WIN32) @@ -43172,42 +43170,41 @@ extern "C" { #define DRMP3_XSTRINGIFY(x) DRMP3_STRINGIFY(x) #define DRMP3_VERSION_MAJOR 0 #define DRMP3_VERSION_MINOR 6 -#define DRMP3_VERSION_REVISION 15 +#define DRMP3_VERSION_REVISION 16 #define DRMP3_VERSION_STRING DRMP3_XSTRINGIFY(DRMP3_VERSION_MAJOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_MINOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_REVISION) #include -#ifdef _MSC_VER - #if defined(__clang__) +typedef signed char drmp3_int8; +typedef unsigned char drmp3_uint8; +typedef signed short drmp3_int16; +typedef unsigned short drmp3_uint16; +typedef signed int drmp3_int32; +typedef unsigned int drmp3_uint32; +#if defined(_MSC_VER) + typedef signed __int64 drmp3_int64; + typedef unsigned __int64 drmp3_uint64; +#else + #if defined(__GNUC__) #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wlanguage-extension-token" #pragma GCC diagnostic ignored "-Wlong-long" - #pragma GCC diagnostic ignored "-Wc++11-long-long" + #if defined(__clang__) + #pragma GCC diagnostic ignored "-Wc++11-long-long" + #endif #endif - typedef signed __int8 drmp3_int8; - typedef unsigned __int8 drmp3_uint8; - typedef signed __int16 drmp3_int16; - typedef unsigned __int16 drmp3_uint16; - typedef signed __int32 drmp3_int32; - typedef unsigned __int32 drmp3_uint32; - typedef signed __int64 drmp3_int64; - typedef unsigned __int64 drmp3_uint64; - #if defined(__clang__) + typedef signed long long drmp3_int64; + typedef unsigned long long drmp3_uint64; + #if defined(__GNUC__) #pragma GCC diagnostic pop #endif -#else - #include - typedef int8_t drmp3_int8; - typedef uint8_t drmp3_uint8; - typedef int16_t drmp3_int16; - typedef uint16_t drmp3_uint16; - typedef int32_t drmp3_int32; - typedef uint32_t drmp3_uint32; - typedef int64_t drmp3_int64; - typedef uint64_t drmp3_uint64; #endif -typedef drmp3_uint8 drmp3_bool8; -typedef drmp3_uint32 drmp3_bool32; -#define DRMP3_TRUE 1 -#define DRMP3_FALSE 0 +#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) + typedef drmp3_uint64 drmp3_uintptr; +#else + typedef drmp3_uint32 drmp3_uintptr; +#endif +typedef drmp3_uint8 drmp3_bool8; +typedef drmp3_uint32 drmp3_bool32; +#define DRMP3_TRUE 1 +#define DRMP3_FALSE 0 #if !defined(DRMP3_API) #if defined(DRMP3_DLL) #if defined(_WIN32)