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

Merge branch 'dev' into dev-0.12

Browse Source
This commit is contained in:
David Reid
2026-04-26 08:22:51 +10:00
parent 5d8e72d54f dcfc24c100
commit 07c4ae67cf
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+7 -7
View File
@@ -3965,7 +3965,7 @@ extern "C" {
#endif #endif
#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__) || defined(__ppc64__) #if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined(_M_IA64) || defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) || defined(__powerpc64__) || defined(__ppc64__)
#define MA_SIZEOF_PTR 8 #define MA_SIZEOF_PTR 8
#else #else
#define MA_SIZEOF_PTR 4 #define MA_SIZEOF_PTR 4
@@ -4095,7 +4095,7 @@ typedef ma_uint16 wchar_t;
#define MA_ARM64 #define MA_ARM64
#endif #endif
#if defined(__x86_64__) || defined(_M_X64) #if defined(__x86_64__) || (defined(_M_X64) && !defined(_M_ARM64EC))
#define MA_X64 #define MA_X64
#elif defined(__i386) || defined(_M_IX86) #elif defined(__i386) || defined(_M_IX86)
#define MA_X86 #define MA_X86
@@ -12181,7 +12181,7 @@ IMPLEMENTATION
#endif #endif
#if defined(MA_ARM) #if defined(MA_ARM)
#if !defined(MA_NO_NEON) && (defined(__ARM_NEON) || defined(__aarch64__) || defined(_M_ARM64)) #if !defined(MA_NO_NEON) && (defined(__ARM_NEON) || defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC))
#define MA_SUPPORT_NEON #define MA_SUPPORT_NEON
#include <arm_neon.h> #include <arm_neon.h>
#endif #endif
@@ -12621,7 +12621,7 @@ static MA_INLINE void ma_restore_denormals(unsigned int prevState)
#ifdef MA_ANDROID #ifdef MA_ANDROID
#include <sys/system_properties.h> #include <sys/system_properties.h>
int ma_android_sdk_version(void) static int ma_android_sdk_version(void)
{ {
char sdkVersion[PROP_VALUE_MAX + 1] = {0, }; char sdkVersion[PROP_VALUE_MAX + 1] = {0, };
if (__system_property_get("ro.build.version.sdk", sdkVersion)) { if (__system_property_get("ro.build.version.sdk", sdkVersion)) {
@@ -47551,7 +47551,7 @@ static ma_result ma_device_init__webaudio(ma_device* pDevice, const void* pDevic
state: 1, /* 1 = ma_device_status_stopped */ state: 1, /* 1 = ma_device_status_stopped */
pDevice: $1 pDevice: $1
}); });
}, pDeviceStateWebAudio->audioContext, pDevice); }, pDeviceStateWebAudio->audioContext, (ma_uintptr)pDevice);
/* /*
We now have enough to initialize the audio worklet. This is asynchronous. Waiting for it to complete will We now have enough to initialize the audio worklet. This is asynchronous. Waiting for it to complete will
@@ -47637,7 +47637,7 @@ static ma_result ma_device_init__webaudio(ma_device* pDevice, const void* pDevic
/* The node processing callback. */ /* The node processing callback. */
device.scriptNode.onaudioprocess = function(e) { device.scriptNode.onaudioprocess = function(e) {
if (device.intermediaryBufferView == null || device.intermediaryBufferView.length == 0) { if (device.intermediaryBufferView == null || device.intermediaryBufferView.length == 0) {
device.intermediaryBufferView = new Float32Array(HEAPF32.buffer, pIntermediaryBuffer, bufferSize * channels); device.intermediaryBufferView = new Float32Array(HEAPF32.buffer, Number(pIntermediaryBuffer), bufferSize * channels);
} }
/* Do the capture side first. */ /* Do the capture side first. */
@@ -47710,7 +47710,7 @@ static ma_result ma_device_init__webaudio(ma_device* pDevice, const void* pDevic
device.pDevice = pDevice; device.pDevice = pDevice;
return window.miniaudio.track_device(device); return window.miniaudio.track_device(device);
}, deviceType, channels, sampleRate, periodSizeInFrames, pDeviceStateWebAudio->pIntermediaryBuffer, pDevice); }, deviceType, channels, sampleRate, periodSizeInFrames, (ma_uintptr)pDeviceStateWebAudio->pIntermediaryBuffer, (ma_uintptr)pDevice);
if (deviceIndex < 0) { if (deviceIndex < 0) {
ma_free(pDeviceStateWebAudio, ma_device_get_allocation_callbacks(pDevice)); ma_free(pDeviceStateWebAudio, ma_device_get_allocation_callbacks(pDevice));
tests/_build/README.md
+1 -1
View File
@@ -34,4 +34,4 @@ Then to compile with CMake:
To do a clean rebuild: To do a clean rebuild:
cmake --build cmake-emcc -j --clean-first cmake --build cmake-emcc -j --clean-first