mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-25 09:02:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(input_autodetect.c) Cleanups pt. 3

Browse Source
This commit is contained in:
twinaphex 2015-03-27 17:31:59 +01:00
parent 57a1f6d9a0
commit c5ece757d8
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
input/input_autodetect.c
View File

@ -82,11 +82,12 @@ static bool input_try_autoconfigure_joypad_from_conf(config_file_t *conf,
static void input_autoconfigure_joypad_add( static void input_autoconfigure_joypad_add(
config_file_t *conf, config_file_t *conf,
autoconfig_params_t *params, autoconfig_params_t *params)
bool block_osd_spam)
{ {
char msg[PATH_MAX_LENGTH]; char msg[PATH_MAX_LENGTH];
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
bool block_osd_spam = settings &&
settings->input.autoconfigured[params->idx] && params->name;
if (!settings) if (!settings)
return; return;
@ -104,9 +105,7 @@ static void input_autoconfigure_joypad_add(
} }
static bool input_autoconfigure_joypad_from_conf( static bool input_autoconfigure_joypad_from_conf(
config_file_t *conf, config_file_t *conf, autoconfig_params_t *params)
autoconfig_params_t *params,
bool block_osd_spam)
{ {
bool ret = false; bool ret = false;
@ -117,8 +116,7 @@ static bool input_autoconfigure_joypad_from_conf(
params); params);
if (ret) if (ret)
input_autoconfigure_joypad_add(conf, params, input_autoconfigure_joypad_add(conf, params);
block_osd_spam);
config_file_free(conf); config_file_free(conf);
@ -131,8 +129,6 @@ void input_config_autoconfigure_joypad(autoconfig_params_t *params)
bool internal_only; bool internal_only;
struct string_list *list = NULL; struct string_list *list = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
bool block_osd_spam = settings &&
settings->input.autoconfigured[params->idx] && params->name;
if (!settings || !settings->input.autodetect_enable) if (!settings || !settings->input.autodetect_enable)
return; return;
@ -161,8 +157,7 @@ void input_config_autoconfigure_joypad(autoconfig_params_t *params)
{ {
config_file_t *conf = (config_file_t*) config_file_t *conf = (config_file_t*)
config_file_new_from_string(input_builtin_autoconfs[i]); config_file_new_from_string(input_builtin_autoconfs[i]);
if (input_autoconfigure_joypad_from_conf(conf, if (input_autoconfigure_joypad_from_conf(conf, params))
params, block_osd_spam))
break; break;
} }
#endif #endif
@ -179,8 +174,7 @@ void input_config_autoconfigure_joypad(autoconfig_params_t *params)
for (i = 0; i < list->size; i++) for (i = 0; i < list->size; i++)
{ {
config_file_t *conf = config_file_new(list->elems[i].data); config_file_t *conf = config_file_new(list->elems[i].data);
if (input_autoconfigure_joypad_from_conf(conf, if (input_autoconfigure_joypad_from_conf(conf, params))
params, block_osd_spam))
break; break;
} }