From da3d6588801f36485f2b37df3eb83c37f05b0db7 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Mon, 9 Dec 2024 23:30:45 -0500 Subject: [PATCH] SDL: Work around build problems with SDL2 < 2.0.6 SDL_AUDIO_ALLOW_SAMPLES_CHANGE was added in 2.0.6, just ignore it if we're compiling against an old version Change-Id: Ia317fe9780b9e39b9fa1f882ada845011d4e8e60 --- firmware/target/hosted/sdl/pcm-sdl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/firmware/target/hosted/sdl/pcm-sdl.c b/firmware/target/hosted/sdl/pcm-sdl.c index efe78403a8..848d10757b 100644 --- a/firmware/target/hosted/sdl/pcm-sdl.c +++ b/firmware/target/hosted/sdl/pcm-sdl.c @@ -89,6 +89,10 @@ void pcm_play_unlock(void) SDL_UnlockMutex(audio_lock); } +#ifndef SDL_AUDIO_ALLOW_SAMPLES_CHANGE +#define SDL_AUDIO_ALLOW_SAMPLES_CHANGE 0 +#endif + static void sdl_audio_callback(struct pcm_udata *udata, Uint8 *stream, int len); static void pcm_dma_apply_settings_nolock(void) { @@ -120,6 +124,8 @@ static void pcm_dma_apply_settings_nolock(void) case AUDIO_S16MSB: pcm_channel_bytes = 2; break; + case AUDIO_S32MSB: + case AUDIO_S32LSB: case AUDIO_F32MSB: case AUDIO_F32LSB: pcm_channel_bytes = 4;