From 28f56a9e1324fbde6854c72d6b234c2f00748d03 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Wed, 27 Nov 2024 11:32:17 -0500 Subject: Sink fixes, update for dependency changes Signed-off-by: Andrew Opalach --- src/mixer/audio_miniaudio.c | 2 +- src/mixer/audio_miniaudio.h | 1 + src/mixer/mixer.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/mixer') diff --git a/src/mixer/audio_miniaudio.c b/src/mixer/audio_miniaudio.c index beda5f1..526e464 100644 --- a/src/mixer/audio_miniaudio.c +++ b/src/mixer/audio_miniaudio.c @@ -85,7 +85,7 @@ static bool audio_miniaudio_init(struct camu_audio *audio, str *name) #else (void)name; #endif - s32 ret = ma_context_init(backends, AL_ARRAY_SIZE(backends), &ma->context_config, &ma->context); + s32 ret = ma_context_init(backends, ARRAY_SIZE(backends), &ma->context_config, &ma->context); if (ret != MA_SUCCESS) { al_log_error("audio_miniaudio", "Failed to initialize context (%d).", ret); return false; diff --git a/src/mixer/audio_miniaudio.h b/src/mixer/audio_miniaudio.h index d93c69c..5bae185 100644 --- a/src/mixer/audio_miniaudio.h +++ b/src/mixer/audio_miniaudio.h @@ -4,6 +4,7 @@ // get included the way we want. // Specifically, on Windows we want to include before . #include +#include #include #include "audio.h" diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c index 7608efc..c144c69 100644 --- a/src/mixer/mixer.c +++ b/src/mixer/mixer.c @@ -109,7 +109,7 @@ void camu_mixer_offset_volume(struct camu_mixer *mixer, f32 amount) if (FLT_MAX - mixer->volume < amount) { mixer->volume = FLT_MAX; } else { - mixer->volume = AL_MAX(0.f, mixer->volume + amount); + mixer->volume = MAX(0.f, mixer->volume + amount); } struct camu_audio_buffer *buf; al_array_foreach(mixer->buffers, i, buf) { -- cgit v1.2.3-101-g0448