ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify input_autoconfigure_connect

This commit is contained in:
twinaphex 2016-12-01 20:41:41 +01:00
parent f1dd06db20
commit 25cc9446e8
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tasks/task_autodetect.c
View File

@ -301,30 +301,31 @@ static bool input_autoconfigure_joypad_init(autoconfig_params_t *params)
bool input_autoconfigure_connect(autoconfig_params_t *params) bool input_autoconfigure_connect(autoconfig_params_t *params)
{ {
if (!input_autoconfigure_joypad_init(params))
return false;
if (string_is_empty(params->name))
return false;
if ( !input_autoconfigure_joypad_from_conf_dir(params)
&& !input_autoconfigure_joypad_from_conf_internal(params))
{
char msg[255]; char msg[255];
msg[0] = '\0'; msg[0] = '\0';
if (!input_autoconfigure_joypad_init(params))
goto error;
if (string_is_empty(params->name))
goto error;
if (input_autoconfigure_joypad_from_conf_dir(params))
return true;
if (input_autoconfigure_joypad_from_conf_internal(params))
return true;
RARCH_LOG("Autodetect: no profiles found for %s (%d/%d).\n", RARCH_LOG("Autodetect: no profiles found for %s (%d/%d).\n",
params->name, params->vid, params->pid); params->name, params->vid, params->pid);
snprintf(msg, sizeof(msg), "%s (%ld/%ld) %s.", snprintf(msg, sizeof(msg), "%s (%ld/%ld) %s.",
params->name, (long)params->vid, (long)params->pid, params->name, (long)params->vid, (long)params->pid,
msg_hash_to_str(MSG_DEVICE_NOT_CONFIGURED)); msg_hash_to_str(MSG_DEVICE_NOT_CONFIGURED));
runloop_msg_queue_push(msg, 2, 60, false); runloop_msg_queue_push(msg, 2, 60, false);
error:
return false; return false;
}
return true;
} }
void input_autoconfigure_disconnect(unsigned i, const char *ident) void input_autoconfigure_disconnect(unsigned i, const char *ident)