(runloop.c) Cleanups

This commit is contained in:
twinaphex 2016-12-05 06:51:53 +01:00
parent cd2abc445a
commit 78005f22f6

View File

@ -135,29 +135,31 @@ global_t *global_get_ptr(void)
return &g_extern;
}
void update_firmware_status()
void update_firmware_status(void)
{
core_info_t *core_info = NULL;
settings_t *settings = config_get_ptr();
core_info_ctx_firmware_t firmware_info;
core_info_t *core_info = NULL;
settings_t *settings = config_get_ptr();
core_info_get_current_core(&core_info);
if (core_info && settings)
if (!core_info || !settings)
return;
firmware_info.path = core_info->path;
if (!string_is_empty(settings->directory.system))
firmware_info.directory.system = settings->directory.system;
else
{
firmware_info.path = core_info->path;
if (!string_is_empty(settings->directory.system))
firmware_info.directory.system = settings->directory.system;
else
{
char s[PATH_MAX_LENGTH];
strlcpy(s, path_get(RARCH_PATH_CONTENT) ,sizeof(s));
path_basedir(s);
firmware_info.directory.system = s;
}
RARCH_LOG("Updating firmware status for: %s on %s\n", core_info->path,
firmware_info.directory.system);
core_info_list_update_missing_firmware(&firmware_info);
char s[PATH_MAX_LENGTH];
strlcpy(s, path_get(RARCH_PATH_CONTENT) ,sizeof(s));
path_basedir(s);
firmware_info.directory.system = s;
}
RARCH_LOG("Updating firmware status for: %s on %s\n", core_info->path,
firmware_info.directory.system);
core_info_list_update_missing_firmware(&firmware_info);
}
void runloop_msg_queue_push(const char *msg,
@ -1264,7 +1266,9 @@ int runloop_iterate(unsigned *sleep_ms)
{
struct retro_keybind *general_binds = settings->input.binds[i];
struct retro_keybind *auto_binds = settings->input.autoconf_binds[i];
if (!settings->input.analog_dpad_mode[i])
enum analog_dpad_mode dpad_mode = settings->input.analog_dpad_mode[i];
if (dpad_mode == ANALOG_DPAD_NONE)
continue;
input_pop_analog_dpad(general_binds);