From c8412bbedae0fce38db96833732e8ce904721e4c Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Sun, 30 Nov 2025 14:32:51 -0500 Subject: Build cleanup and fixes from sink testing Signed-off-by: Andrew Opalach --- src/mixer/audio_miniaudio.c | 62 ++++++++++++++++++++++----------------------- src/mixer/audio_miniaudio.h | 2 +- 2 files changed, 32 insertions(+), 32 deletions(-) (limited to 'src/mixer') diff --git a/src/mixer/audio_miniaudio.c b/src/mixer/audio_miniaudio.c index 993bcca..c0e7cf4 100644 --- a/src/mixer/audio_miniaudio.c +++ b/src/mixer/audio_miniaudio.c @@ -34,19 +34,19 @@ static ma_backend backends[] = { #endif }; -static void *miniaudio_malloc(size_t size, void *userdata) +static void *ma_on_malloc(size_t size, void *userdata) { (void)userdata; return al_malloc(size); } -static void *miniaudio_realloc(void *ptr, size_t size, void *userdata) +static void *ma_on_realloc(void *ptr, size_t size, void *userdata) { (void)userdata; return al_realloc(ptr, size); } -static void miniaudio_free(void *ptr, void *userdata) +static void ma_on_free(void *ptr, void *userdata) { (void)userdata; al_free(ptr); @@ -54,12 +54,12 @@ static void miniaudio_free(void *ptr, void *userdata) static ma_allocation_callbacks alloc_callbacks = { .pUserData = NULL, - .onMalloc = miniaudio_malloc, - .onRealloc = miniaudio_realloc, - .onFree = miniaudio_free + .onMalloc = ma_on_malloc, + .onRealloc = ma_on_realloc, + .onFree = ma_on_free }; -static void miniaudio_log_callback(void *userdata, u32 level, const char *message) +static void log_callback(void *userdata, u32 level, const char *message) { (void)userdata; if (level == MA_LOG_LEVEL_ERROR) { @@ -71,14 +71,14 @@ static void miniaudio_log_callback(void *userdata, u32 level, const char *messag } } -static bool audio_miniaudio_init(struct camu_audio *audio, str *name) +static bool audio_ma_init(struct camu_audio *audio, str *name) { - struct camu_audio_miniaudio *ma = (struct camu_audio_miniaudio *)audio; + struct camu_audio_ma *ma = (struct camu_audio_ma *)audio; #ifdef CAMU_NO_MINIAUDIO_BACKENDS al_assert_and_return(false); #endif ma_log_init(&alloc_callbacks, &ma->log); - ma_log_register_callback(&ma->log, ma_log_callback_init(miniaudio_log_callback, NULL)); + ma_log_register_callback(&ma->log, ma_log_callback_init(log_callback, NULL)); ma->context_config = ma_context_config_init(); ma->context_config.pLog = &ma->log; #ifdef MA_ENABLE_PULSEAUDIO @@ -140,9 +140,9 @@ static s32 camu_sample_format_from_miniaudio(s32 fmt) } } -static void audio_miniaudio_pick_format(struct camu_audio *audio, struct camu_resampler_format *fmt) +static void audio_ma_pick_format(struct camu_audio *audio, struct camu_resampler_format *fmt) { - struct camu_audio_miniaudio *ma = (struct camu_audio_miniaudio *)audio; + struct camu_audio_ma *ma = (struct camu_audio_ma *)audio; fmt->req.format = camu_sample_format_from_miniaudio(ma->device.playback.format); fmt->req.sample_rate = ma->device.playback.internalSampleRate; u32 channels = ma->device.playback.channels; @@ -154,7 +154,7 @@ static void audio_miniaudio_pick_format(struct camu_audio *audio, struct camu_re static void data_callback(ma_device *device, void *output, const void *input, u32 frame_count) { - struct camu_audio_miniaudio *ma = (struct camu_audio_miniaudio *)device->pUserData; + struct camu_audio_ma *ma = (struct camu_audio_ma *)device->pUserData; (void)input; bool silence; ma->a.data_callback(ma->a.userdata, (u8 *)output, frame_count, &silence); @@ -170,9 +170,9 @@ static void data_callback(ma_device *device, void *output, const void *input, u3 #define DEFAULT_PERIOD_SIZE_IN_MILLISECONDS 48 #endif -static bool audio_miniaudio_configure_stream(struct camu_audio *audio, void *opaque) +static bool audio_ma_configure_stream(struct camu_audio *audio, void *opaque) { - struct camu_audio_miniaudio *ma = (struct camu_audio_miniaudio *)audio; + struct camu_audio_ma *ma = (struct camu_audio_ma *)audio; struct camu_ff_resample_fmt *fmt = (struct camu_ff_resample_fmt *)opaque; (void)fmt; ma->config = ma_device_config_init(ma_device_type_playback); @@ -225,9 +225,9 @@ static bool audio_miniaudio_configure_stream(struct camu_audio *audio, void *opa return true; } -static u64 audio_miniaudio_get_latency(struct camu_audio *audio) +static u64 audio_ma_get_latency(struct camu_audio *audio) { - struct camu_audio_miniaudio *ma = (struct camu_audio_miniaudio *)audio; + struct camu_audio_ma *ma = (struct camu_audio_ma *)audio; log_debug("periods: %u, period_size_in_frames: %u, sample_rate: %u.", ma->device.playback.internalPeriods, ma->device.playback.internalPeriodSizeInFrames, @@ -237,21 +237,21 @@ static u64 audio_miniaudio_get_latency(struct camu_audio *audio) (ma->device.playback.internalSampleRate / 1000000.0); } -static void audio_miniaudio_start(struct camu_audio *audio) +static void audio_ma_start(struct camu_audio *audio) { - struct camu_audio_miniaudio *ma = (struct camu_audio_miniaudio *)audio; + struct camu_audio_ma *ma = (struct camu_audio_ma *)audio; ma_device_start(&ma->device); } -static void audio_miniaudio_stop(struct camu_audio *audio) +static void audio_ma_stop(struct camu_audio *audio) { - struct camu_audio_miniaudio *ma = (struct camu_audio_miniaudio *)audio; + struct camu_audio_ma *ma = (struct camu_audio_ma *)audio; ma_device_stop(&ma->device); } -static void audio_miniaudio_free(struct camu_audio **audio) +static void audio_ma_free(struct camu_audio **audio) { - struct camu_audio_miniaudio *ma = (struct camu_audio_miniaudio *)*audio; + struct camu_audio_ma *ma = (struct camu_audio_ma *)*audio; ma_device_uninit(&ma->device); ma_context_uninit(&ma->context); #ifdef MA_ENABLE_PULSEAUDIO @@ -263,15 +263,15 @@ static void audio_miniaudio_free(struct camu_audio **audio) struct camu_audio *camu_audio_miniaudio_create(void) { - struct camu_audio_miniaudio *ma = al_alloc_object(struct camu_audio_miniaudio); + struct camu_audio_ma *ma = al_alloc_object(struct camu_audio_ma); ma->a = (struct camu_audio){ - .init = audio_miniaudio_init, - .pick_format = audio_miniaudio_pick_format, - .configure_stream = audio_miniaudio_configure_stream, - .get_latency = audio_miniaudio_get_latency, - .start = audio_miniaudio_start, - .stop = audio_miniaudio_stop, - .free = audio_miniaudio_free, + .init = audio_ma_init, + .pick_format = audio_ma_pick_format, + .configure_stream = audio_ma_configure_stream, + .get_latency = audio_ma_get_latency, + .start = audio_ma_start, + .stop = audio_ma_stop, + .free = audio_ma_free, .data_callback = NULL, .userdata = NULL }; diff --git a/src/mixer/audio_miniaudio.h b/src/mixer/audio_miniaudio.h index c067024..47e1088 100644 --- a/src/mixer/audio_miniaudio.h +++ b/src/mixer/audio_miniaudio.h @@ -9,7 +9,7 @@ #include "audio.h" -struct camu_audio_miniaudio { +struct camu_audio_ma { struct camu_audio a; ma_log log; ma_context_config context_config; -- cgit v1.2.3-101-g0448