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

Call functions from task_autodetect.c

This commit is contained in:
twinaphex 2017-04-25 15:53:30 +02:00
parent 7b5b49a5e6
commit f4b168f9b6
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
input/input_config.c
View File

@ -495,6 +495,12 @@ void input_config_set_device_name(unsigned port, const char *name)
} }
} }
void input_config_clear_device_name(unsigned port)
{
settings_t *settings = config_get_ptr();
settings->input.device_names[port][0] = '\0';
}
void input_config_set_device(unsigned port, unsigned id) void input_config_set_device(unsigned port, unsigned id)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();

2
input/input_config.h
View File

@ -69,6 +69,8 @@ void input_config_parse_joy_axis(void *data, const char *prefix,
void input_config_set_device_name(unsigned port, const char *name); void input_config_set_device_name(unsigned port, const char *name);
void input_config_clear_device_name(unsigned port);
void input_config_set_device(unsigned port, unsigned id); void input_config_set_device(unsigned port, unsigned id);
const char *input_config_get_device_name(unsigned port); const char *input_config_get_device_name(unsigned port);

5
tasks/task_autodetect.c
View File

@ -67,7 +67,7 @@ static void input_autoconfigure_joypad_reindex_devices(autoconfig_params_t *para
for(i = 0; i < params->max_users; i++) for(i = 0; i < params->max_users; i++)
{ {
unsigned j; unsigned j;
const char *tmp = settings->input.device_names[i]; const char *tmp = input_config_get_device_name(i);
int k = 1; int k = 1;
for(j = 0; j < params->max_users; j++) for(j = 0; j < params->max_users; j++)
@ -367,7 +367,6 @@ bool input_autoconfigure_disconnect(unsigned i, const char *ident)
char msg[255]; char msg[255];
retro_task_t *task = (retro_task_t*)calloc(1, sizeof(*task)); retro_task_t *task = (retro_task_t*)calloc(1, sizeof(*task));
autoconfig_disconnect_t *state = (autoconfig_disconnect_t*)calloc(1, sizeof(*state)); autoconfig_disconnect_t *state = (autoconfig_disconnect_t*)calloc(1, sizeof(*state));
settings_t *settings = config_get_ptr();
if (!state || !task) if (!state || !task)
goto error; goto error;
@ -382,7 +381,7 @@ bool input_autoconfigure_disconnect(unsigned i, const char *ident)
strlcpy(state->msg, msg, sizeof(state->msg)); strlcpy(state->msg, msg, sizeof(state->msg));
settings->input.device_names[state->idx][0] = '\0'; input_config_clear_device_name(state->idx);
task->state = state; task->state = state;
task->handler = input_autoconfigure_disconnect_handler; task->handler = input_autoconfigure_disconnect_handler;