From 949a5c76feadc2fa91b01f002fbb586173bd0a80 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 14 May 2017 23:58:48 +0200 Subject: [PATCH] Cleanup --- retroarch.c | 4 ++-- tasks/task_audio_mixer.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/retroarch.c b/retroarch.c index d3dde35c8b..ce2fd7be6a 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2257,7 +2257,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) return true; } -#if 0 +#if 1 static void runloop_upload_audio(void *task_data, void *user_data, const char *err) { @@ -2634,7 +2634,7 @@ static enum runloop_state runloop_check_state( if (runloop_cmd_triggered(trigger_input, RARCH_RESET)) { command_event(CMD_EVENT_RESET, NULL); -#if 0 +#if 1 task_push_audio_mixer_load("/home/squarepusher/SumertimeBlues.ogg", runloop_upload_audio, NULL); #endif diff --git a/tasks/task_audio_mixer.c b/tasks/task_audio_mixer.c index feca689012..aae605dfa0 100644 --- a/tasks/task_audio_mixer.c +++ b/tasks/task_audio_mixer.c @@ -32,7 +32,6 @@ struct nbio_audio_mixer_handle { - enum nbio_type type; bool is_finished; void *handle; }; @@ -142,18 +141,15 @@ bool task_push_audio_mixer_load(const char *fullpath, retro_task_callback_t cb, goto error; nbio->type = NBIO_TYPE_NONE; - image->type = NBIO_TYPE_NONE; if (strstr(fullpath, file_path_str(FILE_PATH_WAV_EXTENSION))) { nbio->type = NBIO_TYPE_WAV; - image->type = NBIO_TYPE_WAV; nbio->cb = &cb_nbio_audio_wav_loaded; } else if (strstr(fullpath, file_path_str(FILE_PATH_OGG_EXTENSION))) { nbio->type = NBIO_TYPE_OGG; - image->type = NBIO_TYPE_OGG; nbio->cb = &cb_nbio_audio_ogg_loaded; }