From 184fe19a794a5cc08a7e4eefa5d4d5f980455943 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 11 Apr 2015 06:56:02 +0200 Subject: [PATCH] Implement stub versions of write_avail for SDL and CTR audio drivers --- audio/audio_driver.c | 8 ++++---- audio/drivers/ctr_audio.c | 9 ++++++++- audio/drivers/sdl_audio.c | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/audio/audio_driver.c b/audio/audio_driver.c index 8f43b673c0..5c90047fcf 100644 --- a/audio/audio_driver.c +++ b/audio/audio_driver.c @@ -409,7 +409,9 @@ void init_audio(void) if (!global->system.audio_callback.callback && driver->audio_active && settings->audio.rate_control) { - if (driver->audio->buffer_size && driver->audio->write_avail) + /* Audio rate control requires write_avail + * and buffer_size to be implemented. */ + if (driver->audio->buffer_size) { global->audio_data.driver_buffer_size = driver->audio->buffer_size(driver->audio_data); @@ -473,9 +475,7 @@ static int audio_driver_write_avail(void) driver_t *driver = driver_get_ptr(); const audio_driver_t *audio = audio_get_ptr(driver); - if (audio->write_avail) - return audio->write_avail(driver->audio_data); - return 0; + return audio->write_avail(driver->audio_data); } /* diff --git a/audio/drivers/ctr_audio.c b/audio/drivers/ctr_audio.c index 50e46c0561..a82f15561c 100644 --- a/audio/drivers/ctr_audio.c +++ b/audio/drivers/ctr_audio.c @@ -204,6 +204,13 @@ static bool ctr_audio_use_float(void *data) return false; } +static size_t ctr_audio_write_avail(void *data) +{ + /* stub */ + (void)data; + return 0; +} + audio_driver_t audio_ctr = { ctr_audio_init, ctr_audio_write, @@ -214,6 +221,6 @@ audio_driver_t audio_ctr = { ctr_audio_free, ctr_audio_use_float, "ctr", - NULL, + ctr_audio_write_avail, NULL }; diff --git a/audio/drivers/sdl_audio.c b/audio/drivers/sdl_audio.c index 0d05836874..bdccd0d2ce 100644 --- a/audio/drivers/sdl_audio.c +++ b/audio/drivers/sdl_audio.c @@ -233,6 +233,7 @@ static bool sdl_audio_use_float(void *data) static size_t sdl_audio_write_avail(void *data) { + /* stub */ (void)data; return 0; }