libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-18 00:18:22 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

(input_autodetect.c) Cleanups pt. 2

Browse Source
This commit is contained in:
twinaphex 2015-03-27 17:10:09 +01:00
parent 28faf469a0
commit 14270babe5
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
input/input_autodetect.c
View File

@ -98,6 +98,18 @@ found:
return true;
}
static bool input_autoconfigure_joypad_from_conf(
config_file_t *conf,
autoconfig_params_t *params,
bool block_osd_spam)
{
bool ret = input_try_autoconfigure_joypad_from_conf(conf,
params, block_osd_spam);
config_file_free(conf);
return ret;
}
void input_config_autoconfigure_joypad(autoconfig_params_t *params)
{
size_t i;
@ -134,11 +146,9 @@ void input_config_autoconfigure_joypad(autoconfig_params_t *params)
{
config_file_t *conf = (config_file_t*)
config_file_new_from_string(input_builtin_autoconfs[i]);
bool success = input_try_autoconfigure_joypad_from_conf(conf,
params, block_osd_spam);
config_file_free(conf);
if (success)
if (input_autoconfigure_joypad_from_conf(conf,
params, block_osd_spam))
break;
}
#endif
@ -154,15 +164,12 @@ void input_config_autoconfigure_joypad(autoconfig_params_t *params)
for (i = 0; i < list->size; i++)
{
bool success;
config_file_t *conf = config_file_new(list->elems[i].data);
if (!conf)
continue;
success = input_try_autoconfigure_joypad_from_conf(conf,
params, block_osd_spam);
config_file_free(conf);
if (success)
if (input_autoconfigure_joypad_from_conf(conf,
params, block_osd_spam))
break;
}