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

(Android) Cleanups

This commit is contained in:
twinaphex 2015-04-29 01:50:58 +02:00
parent 6f6e1d0e69
commit 71f43f8bf0
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
input/drivers/android_input.c
View File

@ -654,17 +654,20 @@ static void android_input_handle_input(void *data)
handle_hotplug(android, android_app, handle_hotplug(android, android_app,
&android->pads_connected, id, source); &android->pads_connected, id, source);
if (type_event == AINPUT_EVENT_TYPE_MOTION) switch (type_event)
{ {
if (android_input_poll_event_type_motion(android, event, case AINPUT_EVENT_TYPE_MOTION:
port, source)) if (android_input_poll_event_type_motion(android, event,
engine_handle_dpad(android, event, port, source); port, source))
} engine_handle_dpad(android, event, port, source);
else if (type_event == AINPUT_EVENT_TYPE_KEY) break;
{ case AINPUT_EVENT_TYPE_KEY:
int keycode = AKeyEvent_getKeyCode(event); {
android_input_poll_event_type_key(android, android_app, int keycode = AKeyEvent_getKeyCode(event);
event, port, keycode, source, type_event, &handled); android_input_poll_event_type_key(android, android_app,
event, port, keycode, source, type_event, &handled);
}
break;
} }
if (!predispatched) if (!predispatched)

1
settings.c
View File

@ -3595,7 +3595,6 @@ static bool setting_append_list_core_options(
rarch_setting_group_info_t group_info; rarch_setting_group_info_t group_info;
rarch_setting_group_info_t subgroup_info; rarch_setting_group_info_t subgroup_info;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
START_GROUP(group_info, "Core Settings"); START_GROUP(group_info, "Core Settings");