From abffbb95d40cb94936da2e5c627974c3c45654db Mon Sep 17 00:00:00 2001 From: Eric Warmenhoven Date: Tue, 6 Aug 2024 20:03:36 -0400 Subject: [PATCH] Allow compiling SDL2 drivers using griffin (#16843) --- audio/drivers/sdl_audio.c | 4 ++-- audio/drivers_microphone/sdl_microphone.c | 4 ++-- griffin/griffin.c | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/audio/drivers/sdl_audio.c b/audio/drivers/sdl_audio.c index 012da59338..998e9ff48f 100644 --- a/audio/drivers/sdl_audio.c +++ b/audio/drivers/sdl_audio.c @@ -93,7 +93,7 @@ static void sdl_audio_playback_cb(void *data, Uint8 *stream, int len) memset(stream + write_size, 0, len - write_size); } -static INLINE int find_num_frames(int rate, int latency) +static INLINE int sdl_audio_find_num_frames(int rate, int latency) { int frames = (rate * latency) / 1000; @@ -137,7 +137,7 @@ static void *sdl_audio_init(const char *device, * carry approximately half of the latency. * * SDL double buffers audio and we do as well. */ - frames = find_num_frames(rate, latency / 4); + frames = sdl_audio_find_num_frames(rate, latency / 4); /* First, let's initialize the output device. */ spec.freq = rate; diff --git a/audio/drivers_microphone/sdl_microphone.c b/audio/drivers_microphone/sdl_microphone.c index 0875a60960..bf54038949 100644 --- a/audio/drivers_microphone/sdl_microphone.c +++ b/audio/drivers_microphone/sdl_microphone.c @@ -42,7 +42,7 @@ typedef struct sdl_microphone bool nonblock; } sdl_microphone_t; -static INLINE int find_num_frames(int rate, int latency) +static INLINE int sdl_microphone_find_num_frames(int rate, int latency) { int frames = (rate * latency) / 1000; @@ -157,7 +157,7 @@ static void *sdl_microphone_open_mic(void *driver_context, * carry approximately half of the latency. * * SDL double buffers audio and we do as well. */ - frames = find_num_frames(rate, latency / 4); + frames = sdl_microphone_find_num_frames(rate, latency / 4); desired_spec.freq = rate; desired_spec.format = AUDIO_F32SYS; diff --git a/griffin/griffin.c b/griffin/griffin.c index d1986ea638..e94db43fa4 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -882,6 +882,9 @@ AUDIO #if defined(HAVE_SDL2) #include "../audio/drivers/sdl_audio.c" +#include "../input/drivers/sdl_input.c" +#include "../input/drivers_joypad/sdl_joypad.c" +#include "../gfx/drivers_context/sdl_gl_ctx.c" #ifdef HAVE_MICROPHONE #include "../audio/drivers_microphone/sdl_microphone.c" #endif