(Android) Change some autodetection logic
This commit is contained in:
parent
52a160a744
commit
9fbece1f1c
|
@ -1623,7 +1623,9 @@ static void android_input_poll(void *data)
|
||||||
state_id = pads_connected;
|
state_id = pads_connected;
|
||||||
state_device_ids[pads_connected++] = id;
|
state_device_ids[pads_connected++] = id;
|
||||||
|
|
||||||
|
if (g_settings.input.autodetect_enable)
|
||||||
input_autodetect_setup(android_app, msg, sizeof(msg), state_id, id, source);
|
input_autodetect_setup(android_app, msg, sizeof(msg), state_id, id, source);
|
||||||
|
|
||||||
long_msg_enable = true;
|
long_msg_enable = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -101,8 +101,6 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (g_settings.input.autodetect_enable)
|
|
||||||
{
|
|
||||||
device = 0;
|
device = 0;
|
||||||
|
|
||||||
if (strstr(name_buf,"Logitech") && strstr(name_buf, "RumblePad 2"))
|
if (strstr(name_buf,"Logitech") && strstr(name_buf, "RumblePad 2"))
|
||||||
|
@ -244,7 +242,6 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
|
||||||
if (driver.input->set_keybinds)
|
if (driver.input->set_keybinds)
|
||||||
driver.input->set_keybinds(driver.input_data, device, port, id,
|
driver.input->set_keybinds(driver.input_data, device, port, id,
|
||||||
(1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS));
|
(1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS));
|
||||||
}
|
|
||||||
|
|
||||||
if (name_buf[0] != 0)
|
if (name_buf[0] != 0)
|
||||||
snprintf(msg, sizeof_msg, "Port %d: %s.\n", port, name_buf);
|
snprintf(msg, sizeof_msg, "Port %d: %s.\n", port, name_buf);
|
||||||
|
|
Loading…
Reference in New Issue