CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-21 10:20:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(input_autodetect.c) Further cleanups

Browse Source
This commit is contained in:
twinaphex 2015-03-27 18:05:43 +01:00
parent f88e62b3d2
commit 9923e6a021
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
input/input_autodetect.c
View File

@ -123,26 +123,29 @@ static bool input_autoconfigure_joypad_from_conf(
return ret;
}
static void input_autoconfigure_joypad_from_conf_dir(
static bool input_autoconfigure_joypad_from_conf_dir(
autoconfig_params_t *params)
{
size_t i;
bool ret = false;
settings_t *settings = config_get_ptr();
struct string_list *list = settings ? dir_list_new(
settings->input.autoconfig_dir, "cfg", false) : NULL;
if (!list)
return;
return false;
for (i = 0; i < list->size; i++)
{
config_file_t *conf = config_file_new(list->elems[i].data);
if (input_autoconfigure_joypad_from_conf(conf, params))
if ((ret = input_autoconfigure_joypad_from_conf(conf, params)))
break;
}
string_list_free(list);
return ret;
}
#if defined(HAVE_BUILTIN_AUTOCONFIG)
@ -169,14 +172,13 @@ static bool input_autoconfigure_joypad_from_conf_internal(
}
#endif
void input_config_autoconfigure_joypad(autoconfig_params_t *params)
static bool input_config_autoconfigure_joypad_init(autoconfig_params_t *params)
{
size_t i;
bool ret = false;
settings_t *settings = config_get_ptr();
if (!settings || !settings->input.autodetect_enable)
return;
return false;
for (i = 0; i < RARCH_BIND_LIST_END; i++)
{
@ -187,6 +189,16 @@ void input_config_autoconfigure_joypad(autoconfig_params_t *params)
}
settings->input.autoconfigured[params->idx] = false;
return true;
}
void input_config_autoconfigure_joypad(autoconfig_params_t *params)
{
bool ret = false;
if (!input_config_autoconfigure_joypad_init(params))
return;
if (!params->name)
return;
@ -195,7 +207,7 @@ void input_config_autoconfigure_joypad(autoconfig_params_t *params)
#endif
if (!ret)
input_autoconfigure_joypad_from_conf_dir(params);
ret = input_autoconfigure_joypad_from_conf_dir(params);
}
const struct retro_keybind *input_get_auto_bind(unsigned port, unsigned id)