Skip to content

M
miniaudio
Commit f099c7b1 authored by David Reid's avatar David Reid
Browse files
Options

Merge branch 'dev' into dev-0.11

parents c43eac28 5a5d523d
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 15 deletions
extras/miniaudio_split/miniaudio.c
View file @ f099c7b1
/* /*
Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file. Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file.
miniaudio - v0.10.40 - 2021-07-23 miniaudio - v0.10.41 - 2021-08-15
David Reid - mackron@gmail.com David Reid - mackron@gmail.com
...@@ -19996,8 +19996,8 @@ static ma_result ma_context__init_device_tracking__coreaudio(ma_context* pContex ...@@ -19996,8 +19996,8 @@ static ma_result ma_context__init_device_tracking__coreaudio(ma_context* pContex
propAddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice; propAddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice;
((ma_AudioObjectAddPropertyListener_proc)pContext->coreaudio.AudioObjectAddPropertyListener)(kAudioObjectSystemObject, &propAddress, &ma_default_device_changed__coreaudio, NULL); ((ma_AudioObjectAddPropertyListener_proc)pContext->coreaudio.AudioObjectAddPropertyListener)(kAudioObjectSystemObject, &propAddress, &ma_default_device_changed__coreaudio, NULL);
g_DeviceTrackingInitCounter_CoreAudio += 1;
} }
g_DeviceTrackingInitCounter_CoreAudio += 1;
} }
ma_spinlock_unlock(&g_DeviceTrackingInitLock_CoreAudio); ma_spinlock_unlock(&g_DeviceTrackingInitLock_CoreAudio);
...@@ -20010,7 +20010,8 @@ static ma_result ma_context__uninit_device_tracking__coreaudio(ma_context* pCont ...@@ -20010,7 +20010,8 @@ static ma_result ma_context__uninit_device_tracking__coreaudio(ma_context* pCont
ma_spinlock_lock(&g_DeviceTrackingInitLock_CoreAudio); ma_spinlock_lock(&g_DeviceTrackingInitLock_CoreAudio);
{ {
g_DeviceTrackingInitCounter_CoreAudio -= 1; if (g_DeviceTrackingInitCounter_CoreAudio > 0)
g_DeviceTrackingInitCounter_CoreAudio -= 1;
if (g_DeviceTrackingInitCounter_CoreAudio == 0) { if (g_DeviceTrackingInitCounter_CoreAudio == 0) {
AudioObjectPropertyAddress propAddress; AudioObjectPropertyAddress propAddress;
...@@ -20026,6 +20027,8 @@ static ma_result ma_context__uninit_device_tracking__coreaudio(ma_context* pCont ...@@ -20026,6 +20027,8 @@ static ma_result ma_context__uninit_device_tracking__coreaudio(ma_context* pCont
/* At this point there should be no tracked devices. If not there's an error somewhere. */ /* At this point there should be no tracked devices. If not there's an error somewhere. */
if (g_ppTrackedDevices_CoreAudio != NULL) { if (g_ppTrackedDevices_CoreAudio != NULL) {
ma_context_post_error(pContext, NULL, MA_LOG_LEVEL_WARNING, "You have uninitialized all contexts while an associated device is still active.", MA_INVALID_OPERATION); ma_context_post_error(pContext, NULL, MA_LOG_LEVEL_WARNING, "You have uninitialized all contexts while an associated device is still active.", MA_INVALID_OPERATION);
ma_spinlock_unlock(&g_DeviceTrackingInitLock_CoreAudio);
return MA_INVALID_OPERATION;
} }
ma_mutex_uninit(&g_DeviceTrackingMutex_CoreAudio); ma_mutex_uninit(&g_DeviceTrackingMutex_CoreAudio);
...@@ -39441,7 +39444,7 @@ extern "C" { ...@@ -39441,7 +39444,7 @@ extern "C" {
#define DRWAV_XSTRINGIFY(x) DRWAV_STRINGIFY(x) #define DRWAV_XSTRINGIFY(x) DRWAV_STRINGIFY(x)
#define DRWAV_VERSION_MAJOR 0 #define DRWAV_VERSION_MAJOR 0
#define DRWAV_VERSION_MINOR 13 #define DRWAV_VERSION_MINOR 13
#define DRWAV_VERSION_REVISION 0 #define DRWAV_VERSION_REVISION 1
#define DRWAV_VERSION_STRING DRWAV_XSTRINGIFY(DRWAV_VERSION_MAJOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_MINOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_REVISION) #define DRWAV_VERSION_STRING DRWAV_XSTRINGIFY(DRWAV_VERSION_MAJOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_MINOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_REVISION)
#include <stddef.h> #include <stddef.h>
typedef signed char drwav_int8; typedef signed char drwav_int8;
...@@ -39467,7 +39470,7 @@ typedef unsigned int drwav_uint32; ...@@ -39467,7 +39470,7 @@ typedef unsigned int drwav_uint32;
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#endif #endif
#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) #if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(_M_ARM64) || defined(__powerpc64__)
typedef drwav_uint64 drwav_uintptr; typedef drwav_uint64 drwav_uintptr;
#else #else
typedef drwav_uint32 drwav_uintptr; typedef drwav_uint32 drwav_uintptr;
...@@ -39976,7 +39979,7 @@ extern "C" { ...@@ -39976,7 +39979,7 @@ extern "C" {
#define DRFLAC_XSTRINGIFY(x) DRFLAC_STRINGIFY(x) #define DRFLAC_XSTRINGIFY(x) DRFLAC_STRINGIFY(x)
#define DRFLAC_VERSION_MAJOR 0 #define DRFLAC_VERSION_MAJOR 0
#define DRFLAC_VERSION_MINOR 12 #define DRFLAC_VERSION_MINOR 12
#define DRFLAC_VERSION_REVISION 29 #define DRFLAC_VERSION_REVISION 30
#define DRFLAC_VERSION_STRING DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MAJOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MINOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_REVISION) #define DRFLAC_VERSION_STRING DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MAJOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MINOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_REVISION)
#include <stddef.h> #include <stddef.h>
typedef signed char drflac_int8; typedef signed char drflac_int8;
...@@ -40002,7 +40005,7 @@ typedef unsigned int drflac_uint32; ...@@ -40002,7 +40005,7 @@ typedef unsigned int drflac_uint32;
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#endif #endif
#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) #if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(_M_ARM64) || defined(__powerpc64__)
typedef drflac_uint64 drflac_uintptr; typedef drflac_uint64 drflac_uintptr;
#else #else
typedef drflac_uint32 drflac_uintptr; typedef drflac_uint32 drflac_uintptr;
...@@ -40337,7 +40340,7 @@ extern "C" { ...@@ -40337,7 +40340,7 @@ extern "C" {
#define DRMP3_XSTRINGIFY(x) DRMP3_STRINGIFY(x) #define DRMP3_XSTRINGIFY(x) DRMP3_STRINGIFY(x)
#define DRMP3_VERSION_MAJOR 0 #define DRMP3_VERSION_MAJOR 0
#define DRMP3_VERSION_MINOR 6 #define DRMP3_VERSION_MINOR 6
#define DRMP3_VERSION_REVISION 27 #define DRMP3_VERSION_REVISION 28
#define DRMP3_VERSION_STRING DRMP3_XSTRINGIFY(DRMP3_VERSION_MAJOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_MINOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_REVISION) #define DRMP3_VERSION_STRING DRMP3_XSTRINGIFY(DRMP3_VERSION_MAJOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_MINOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_REVISION)
#include <stddef.h> #include <stddef.h>
typedef signed char drmp3_int8; typedef signed char drmp3_int8;
...@@ -40363,7 +40366,7 @@ typedef unsigned int drmp3_uint32; ...@@ -40363,7 +40366,7 @@ typedef unsigned int drmp3_uint32;
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#endif #endif
#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) #if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(_M_ARM64) || defined(__powerpc64__)
typedef drmp3_uint64 drmp3_uintptr; typedef drmp3_uint64 drmp3_uintptr;
#else #else
typedef drmp3_uint32 drmp3_uintptr; typedef drmp3_uint32 drmp3_uintptr;
...@@ -59465,7 +59468,7 @@ static int drmp3_have_simd(void) ...@@ -59465,7 +59468,7 @@ static int drmp3_have_simd(void)
#endif #endif
#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) && !defined(_M_ARM64) #if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) && !defined(_M_ARM64)
#define DRMP3_HAVE_ARMV6 1 #define DRMP3_HAVE_ARMV6 1
static __inline__ __attribute__((always_inline)) drmp3_int32 drmp3_clip_int16_arm(int32_t a) static __inline__ __attribute__((always_inline)) drmp3_int32 drmp3_clip_int16_arm(drmp3_int32 a)
{ {
drmp3_int32 x = 0; drmp3_int32 x = 0;
__asm__ ("ssat %0, #16, %1" : "=r"(x) : "r"(a)); __asm__ ("ssat %0, #16, %1" : "=r"(x) : "r"(a));
extras/miniaudio_split/miniaudio.h
View file @ f099c7b1
/* /*
Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file. Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file.
miniaudio - v0.10.40 - 2021-07-23 miniaudio - v0.10.41 - 2021-08-15
David Reid - mackron@gmail.com David Reid - mackron@gmail.com
...@@ -20,7 +20,7 @@ extern "C" { ...@@ -20,7 +20,7 @@ extern "C" {
#define MA_VERSION_MAJOR 0 #define MA_VERSION_MAJOR 0
#define MA_VERSION_MINOR 10 #define MA_VERSION_MINOR 10
#define MA_VERSION_REVISION 40 #define MA_VERSION_REVISION 41
#define MA_VERSION_STRING MA_XSTRINGIFY(MA_VERSION_MAJOR) "." MA_XSTRINGIFY(MA_VERSION_MINOR) "." MA_XSTRINGIFY(MA_VERSION_REVISION) #define MA_VERSION_STRING MA_XSTRINGIFY(MA_VERSION_MAJOR) "." MA_XSTRINGIFY(MA_VERSION_MINOR) "." MA_XSTRINGIFY(MA_VERSION_REVISION)
#if defined(_MSC_VER) && !defined(__clang__) #if defined(_MSC_VER) && !defined(__clang__)
...@@ -94,7 +94,7 @@ typedef unsigned int ma_uint32; ...@@ -94,7 +94,7 @@ typedef unsigned int ma_uint32;
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#endif #endif
#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__) #if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(_M_ARM64) || defined(__powerpc64__)
typedef ma_uint64 ma_uintptr; typedef ma_uint64 ma_uintptr;
#else #else
typedef ma_uint32 ma_uintptr; typedef ma_uint32 ma_uintptr;
......
miniaudio.h
View file @ f099c7b1
/* /*
Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file. Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file.
miniaudio - v0.10.41 - TBD miniaudio - v0.10.41 - 2021-08-15
David Reid - mackron@gmail.com David Reid - mackron@gmail.com
...@@ -87546,7 +87546,7 @@ The following miscellaneous changes have also been made. ...@@ -87546,7 +87546,7 @@ The following miscellaneous changes have also been made.
/* /*
REVISION HISTORY REVISION HISTORY
================ ================
v0.10.41 - TBD v0.10.41 - 2021-08-15
- Core Audio: Fix some deadlock errors. - Core Audio: Fix some deadlock errors.
v0.10.40 - 2021-07-23 v0.10.40 - 2021-07-23
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