From cff3398af4bea9d65b7b13757a02038d51f8b6d5 Mon Sep 17 00:00:00 2001 From: David Reid Date: Sun, 4 Jul 2021 13:48:11 +1000 Subject: [PATCH] Move some macros over to the main library. --- miniaudio.h | 2 ++ research/miniaudio_engine.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/miniaudio.h b/miniaudio.h index f0c74fc9..a60719e9 100644 --- a/miniaudio.h +++ b/miniaudio.h @@ -7304,6 +7304,8 @@ Standard Library Stuff #define ma_abs(x) (((x) > 0) ? (x) : -(x)) #define ma_clamp(x, lo, hi) (ma_max(lo, ma_min(x, hi))) #define ma_offset_ptr(p, offset) (((ma_uint8*)(p)) + (offset)) +#define ma_align(x, a) ((x + (a-1)) & ~(a-1)) +#define ma_align_64(x) ma_align(x, 8) #define ma_buffer_frame_capacity(buffer, channels, format) (sizeof(buffer) / ma_get_bytes_per_sample(format) / (channels)) diff --git a/research/miniaudio_engine.h b/research/miniaudio_engine.h index 6c9ae3b6..9e0c13d4 100644 --- a/research/miniaudio_engine.h +++ b/research/miniaudio_engine.h @@ -2378,9 +2378,6 @@ MA_API float ma_delay_node_get_decay(const ma_delay_node* pDelayNode); #if defined(MA_IMPLEMENTATION) || defined(MINIAUDIO_IMPLEMENTATION) -#define ma_align(x, a) ((x + (a-1)) & ~(a-1)) -#define ma_align_64(x) ma_align(x, 8) - MA_API ma_result ma_paged_audio_buffer_data_init(ma_format format, ma_uint32 channels, ma_paged_audio_buffer_data* pData) { if (pData == NULL) {