diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2024-12-09 23:30:45 -0500 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2024-12-09 23:35:09 -0500 |
| commit | da3d6588801f36485f2b37df3eb83c37f05b0db7 (patch) | |
| tree | b637332f418c9bd84725ee56a96e8b1d6c925511 | |
| parent | 1328464c86a0c83bfbafa21c90c2e786bbe792ff (diff) | |
| download | rockbox-da3d658880.tar.gz rockbox-da3d658880.zip | |
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
| -rw-r--r-- | firmware/target/hosted/sdl/pcm-sdl.c | 6 |
1 files changed, 6 insertions, 0 deletions
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; |