diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c index 8e9dee6235..1062ebae1b 100644 --- a/console/griffin/griffin.c +++ b/console/griffin/griffin.c @@ -208,19 +208,6 @@ STATE TRACKER ============================================================ */ #include "../../gfx/state_tracker.c" -/*============================================================ -DRIVERS -============================================================ */ -#include "../../driver.c" - -/*============================================================ -SCALERS -============================================================ */ -#include "../../gfx/scaler/filter.c" -#include "../../gfx/scaler/pixconv.c" -#include "../../gfx/scaler/scaler.c" -#include "../../gfx/scaler/scaler_int.c" - /*============================================================ FIFO BUFFER ============================================================ */ @@ -273,6 +260,20 @@ AUDIO #include "../../audio/null.c" +/*============================================================ +DRIVERS +============================================================ */ +#include "../../driver.c" + +/*============================================================ +SCALERS +============================================================ */ +#include "../../gfx/scaler/filter.c" +#include "../../gfx/scaler/pixconv.c" +#include "../../gfx/scaler/scaler.c" +#include "../../gfx/scaler/scaler_int.c" + + /*============================================================ DYNAMIC ============================================================ */ diff --git a/console/griffin/hook.h b/console/griffin/hook.h index bcf9dc84c9..b8d4c22c87 100644 --- a/console/griffin/hook.h +++ b/console/griffin/hook.h @@ -13,6 +13,23 @@ * You should have received a copy of the GNU General Public License along with RetroArch. * If not, see . */ + +#if !defined(HAVE_RSOUND) + +#if defined(HAVE_SL) +#define audio_init_func(device, rate, latency) sl_init(device, rate, latency) +#define audio_write_func(buf, size) sl_write(driver.audio_data, buf, size) +#define audio_stop_func() sl_stop(driver.audio_data) +#define audio_start_func() sl_start(driver.audio_data) +#define audio_set_nonblock_state_func(state) sl_set_nonblock_state(driver.audio_data, state) +#define audio_free_func() sl_free(driver.audio_data) +#define audio_use_float_func() driver.audio->use_float(driver.audio_data) +#define audio_write_avail_func() sl_write_avail(driver.audio_data) +#define audio_buffer_size_func() (BUFFER_SIZE * NUM_BUFFERS) +#endif + +#else + #define audio_init_func(device, rate, latency) driver.audio->init(device, rate, latency) #define audio_write_func(buf, size) driver.audio->write(driver.audio_data, buf, size) #define audio_stop_func() driver.audio->stop(driver.audio_data) @@ -23,6 +40,8 @@ #define audio_write_avail_func() driver.audio->write_avail(driver.audio_data) #define audio_buffer_size_func() driver.audio->buffer_size(driver.audio_data) +#endif + /*============================================================ VIDEO ============================================================ */