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

(Android) Input driver - cleanup

Browse Source
This commit is contained in:
twinaphex 2014-06-11 00:11:30 +02:00
parent 4eb288f348
commit 406dc253eb
1 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
input/android_input.c
View File

@ -448,7 +448,7 @@ static void input_autodetect_get_device_name(void *data, char *buf, size_t size,
} }
static void handle_hotplug(void *data, unsigned port, unsigned id, static void handle_hotplug(void *data, unsigned port, unsigned id,
int source, bool *primary) int source)
{ {
struct android_app *android_app = (struct android_app*)data; struct android_app *android_app = (struct android_app*)data;
@ -616,7 +616,6 @@ static void handle_hotplug(void *data, unsigned port, unsigned id,
{ {
device = DEVICE_NVIDIA_SHIELD; device = DEVICE_NVIDIA_SHIELD;
port = 0; // Shield is always player 1. port = 0; // Shield is always player 1.
*primary = true;
strlcpy(name_buf, "NVIDIA Shield", sizeof(name_buf)); strlcpy(name_buf, "NVIDIA Shield", sizeof(name_buf));
} }
else if (strstr(name_buf, "Samsung Game Pad EI-GP20")) else if (strstr(name_buf, "Samsung Game Pad EI-GP20"))
@ -641,7 +640,7 @@ static void handle_hotplug(void *data, unsigned port, unsigned id,
if (source == AINPUT_SOURCE_KEYBOARD && device != DEVICE_XPERIA_PLAY) if (source == AINPUT_SOURCE_KEYBOARD && device != DEVICE_XPERIA_PLAY)
device = DEVICE_KEYBOARD_RETROPAD; device = DEVICE_KEYBOARD_RETROPAD;
if (device != DEVICE_NONE) if (device != DEVICE_NONE && name_buf[0] != '\0')
{ {
strlcpy(g_settings.input.device_names[port], name_buf, sizeof(g_settings.input.device_names[port])); strlcpy(g_settings.input.device_names[port], name_buf, sizeof(g_settings.input.device_names[port]));
input_config_autoconfigure_joypad(port, name_buf, android_joypad.ident); input_config_autoconfigure_joypad(port, name_buf, android_joypad.ident);
@ -704,24 +703,8 @@ static void android_input_poll(void *data)
{ {
port = android->pads_connected; port = android->pads_connected;
if (g_settings.input.autodetect_enable) if (g_settings.input.autodetect_enable)
{ handle_hotplug(android_app, port, id, source);
bool primary = false; android->state_device_ids[android->pads_connected++] = id;
handle_hotplug(android_app, port, id, source, &primary);
if (primary)
{
RARCH_LOG("Found primary input device.\n");
memmove(android->state_device_ids + 1, android->state_device_ids,
android->pads_connected * sizeof(android->state_device_ids[0]));
port = 0;
android->state_device_ids[0] = id;
android->pads_connected++;
}
else
android->state_device_ids[android->pads_connected++] = id;
}
else
android->state_device_ids[android->pads_connected++] = id;
} }
if (type_event == AINPUT_EVENT_TYPE_MOTION) if (type_event == AINPUT_EVENT_TYPE_MOTION)
@ -950,25 +933,17 @@ const input_driver_t input_android = {
static bool android_joypad_init(void) static bool android_joypad_init(void)
{ {
int i; engine_handle_dpad = engine_handle_dpad_default;
if ((dlopen("/system/lib/libandroid.so", RTLD_LOCAL | RTLD_LAZY)) == 0)
for (i = 0; i < MAX_PLAYERS; i++)
strlcpy(g_settings.input.device_names[i], "Custom", sizeof(g_settings.input.device_names[i]));
if ((dlopen("/system/lib/libandroid.so", RTLD_LOCAL | RTLD_LAZY)) != 0)
{
engine_handle_dpad = engine_handle_dpad_default;
p_AMotionEvent_getAxisValue = dlsym(RTLD_DEFAULT, "AMotionEvent_getAxisValue");
if (p_AMotionEvent_getAxisValue)
{
RARCH_LOG("Set engine_handle_dpad to 'Get Axis Value' (for reading extra analog sticks)");
engine_handle_dpad = engine_handle_dpad_getaxisvalue;
}
}
else
{ {
RARCH_WARN("Unable to open libandroid.so\n"); RARCH_WARN("Unable to open libandroid.so\n");
return true;
}
if ((p_AMotionEvent_getAxisValue = dlsym(RTLD_DEFAULT, "AMotionEvent_getAxisValue")))
{
RARCH_LOG("Set engine_handle_dpad to 'Get Axis Value' (for reading extra analog sticks)");
engine_handle_dpad = engine_handle_dpad_getaxisvalue;
} }
return true; return true;