mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-24 01:04:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 0.10.14

Browse Source
This commit is contained in:
David Reid
2020-07-14 17:34:18 +10:00
parent 6c67ba62c3
commit b9362d8fa4
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extras/miniaudio_split/miniaudio.c
+9 -9
View File
@@ -1,6 +1,6 @@
/* /*
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.13 - 2020-07-11 miniaudio - v0.10.14 - 2020-07-14
David Reid - davidreidsoftware@gmail.com David Reid - davidreidsoftware@gmail.com
@@ -519,13 +519,13 @@ static MA_INLINE void ma_yield()
#else #else
__asm__ __volatile__ ("pause"); __asm__ __volatile__ ("pause");
#endif #endif
#elif (defined(__arm__) && defined(__ARM_ARCH) && __ARM_ARCH >= 6) || (defined(_M_ARM) && _M_ARM >= 6) #elif (defined(__arm__) && defined(__ARM_ARCH) && __ARM_ARCH >= 7) || (defined(_M_ARM) && _M_ARM >= 7) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__)
/* ARM */ /* ARM */
#if defined(_MSC_VER) #if defined(_MSC_VER)
/* Apparently there is a __yield() intrinsic that's compatible with ARM, but I cannot find documentation for it nor can I find where it's declared. */ /* Apparently there is a __yield() intrinsic that's compatible with ARM, but I cannot find documentation for it nor can I find where it's declared. */
__yield(); __yield();
#else #else
__asm__ __volatile__ ("yield"); __asm__ __volatile__ ("yield"); /* ARMv6K/ARMv6T2 and above. */
#endif #endif
#else #else
/* Unknown or unsupported architecture. No-op. */ /* Unknown or unsupported architecture. No-op. */
@@ -23217,7 +23217,7 @@ static SLuint32 ma_channel_map_to_channel_mask__opensl(const ma_channel* pChanne
SLuint32 channelMask = 0; SLuint32 channelMask = 0;
ma_uint32 iChannel; ma_uint32 iChannel;
for (iChannel = 0; iChannel < channels; ++iChannel) { for (iChannel = 0; iChannel < channels; ++iChannel) {
channelMask |= ma_channel_id_to_opensl(channelMap[iChannel]); channelMask |= ma_channel_id_to_opensl(pChannelMap[iChannel]);
} }
return channelMask; return channelMask;
@@ -23227,13 +23227,13 @@ static SLuint32 ma_channel_map_to_channel_mask__opensl(const ma_channel* pChanne
static void ma_channel_mask_to_channel_map__opensl(SLuint32 channelMask, ma_uint32 channels, ma_channel* pChannelMap) static void ma_channel_mask_to_channel_map__opensl(SLuint32 channelMask, ma_uint32 channels, ma_channel* pChannelMap)
{ {
if (channels == 1 && channelMask == 0) { if (channels == 1 && channelMask == 0) {
channelMap[0] = MA_CHANNEL_MONO; pChannelMap[0] = MA_CHANNEL_MONO;
} else if (channels == 2 && channelMask == 0) { } else if (channels == 2 && channelMask == 0) {
channelMap[0] = MA_CHANNEL_FRONT_LEFT; pChannelMap[0] = MA_CHANNEL_FRONT_LEFT;
channelMap[1] = MA_CHANNEL_FRONT_RIGHT; pChannelMap[1] = MA_CHANNEL_FRONT_RIGHT;
} else { } else {
if (channels == 1 && (channelMask & SL_SPEAKER_FRONT_CENTER) != 0) { if (channels == 1 && (channelMask & SL_SPEAKER_FRONT_CENTER) != 0) {
channelMap[0] = MA_CHANNEL_MONO; pChannelMap[0] = MA_CHANNEL_MONO;
} else { } else {
/* Just iterate over each bit. */ /* Just iterate over each bit. */
ma_uint32 iChannel = 0; ma_uint32 iChannel = 0;
@@ -23242,7 +23242,7 @@ static void ma_channel_mask_to_channel_map__opensl(SLuint32 channelMask, ma_uint
SLuint32 bitValue = (channelMask & (1UL << iBit)); SLuint32 bitValue = (channelMask & (1UL << iBit));
if (bitValue != 0) { if (bitValue != 0) {
/* The bit is set. */ /* The bit is set. */
channelMap[iChannel] = ma_channel_id_to_ma__opensl(bitValue); pChannelMap[iChannel] = ma_channel_id_to_ma__opensl(bitValue);
iChannel += 1; iChannel += 1;
} }
} }
extras/miniaudio_split/miniaudio.h
+2 -2
View File
@@ -1,6 +1,6 @@
/* /*
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.13 - 2020-07-11 miniaudio - v0.10.14 - 2020-07-14
David Reid - davidreidsoftware@gmail.com David Reid - davidreidsoftware@gmail.com
@@ -19,7 +19,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 13 #define MA_VERSION_REVISION 14
#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__)
miniaudio.h
+2 -2
View File
@@ -1,6 +1,6 @@
/* /*
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.14 - TBD miniaudio - v0.10.14 - 2020-07-14
David Reid - davidreidsoftware@gmail.com David Reid - davidreidsoftware@gmail.com
@@ -61966,7 +61966,7 @@ The following miscellaneous changes have also been made.
/* /*
REVISION HISTORY REVISION HISTORY
================ ================
v0.10.14 - TBD v0.10.14 - 2020-07-14
- Fix compilation errors on Android. - Fix compilation errors on Android.
- Fix compilation errors with -march=armv6. - Fix compilation errors with -march=armv6.
- Updates to the documentation. - Updates to the documentation.