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

Menu toggle should be properly saved now with custom bind - the

Browse Source 
forced hack broke all sorts of behavior
This commit is contained in:
twinaphex 2015-07-09 22:16:27 +02:00
parent d7db50e4eb
commit 34414b5919
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/drivers/platform_android.c
View File

@ -757,10 +757,12 @@ static void frontend_android_get_environment_settings(int *argc,
else if (!strcmp(device_model, "JSS15J"))
g_defaults.settings.video_refresh_rate = 59.65;
#if 0
/* Explicitly disable input overlay by default
* for gamepad-like/console devices. */
if (device_is_game_console(device_model))
g_defaults.settings.input_overlay_enable = false;
#endif
}
static void frontend_android_deinit(void *data)

15
input/drivers_joypad/android_joypad.c
View File

@ -24,15 +24,8 @@ static const char *android_joypad_name(unsigned pad)
static bool android_joypad_init(void *data)
{
unsigned autoconf_pad;
settings_t *settings = config_get_ptr();
(void)data;
for (autoconf_pad = 0; autoconf_pad < MAX_USERS; autoconf_pad++)
settings->input.binds[autoconf_pad][RARCH_MENU_TOGGLE].joykey = AKEYCODE_BACK;
engine_handle_dpad = engine_handle_dpad_default;
if ((dlopen("/system/lib/libandroid.so", RTLD_LOCAL | RTLD_LAZY)) == 0)
{
RARCH_WARN("Unable to open libandroid.so\n");
@ -53,7 +46,7 @@ static bool android_joypad_button(unsigned port, uint16_t joykey)
{
uint8_t *buf = NULL;
driver_t *driver = driver_get_ptr();
android_input_t *android = (android_input_t*)driver->input_data;
android_input_t *android = driver ? (android_input_t*)driver->input_data : NULL;
if (!android || port >= MAX_PADS)
return false;
@ -91,7 +84,7 @@ static int16_t android_joypad_axis(unsigned port, uint32_t joyaxis)
bool is_neg = false;
bool is_pos = false;
driver_t *driver = driver_get_ptr();
android_input_t *android = (android_input_t*)driver->input_data;
android_input_t *android = driver ? (android_input_t*)driver->input_data : NULL;
if (!android || joyaxis == AXIS_NONE || port >= MAX_PADS)
return 0;
@ -124,7 +117,7 @@ static void android_joypad_poll(void)
static bool android_joypad_query_pad(unsigned pad)
{
driver_t *driver = driver_get_ptr();
android_input_t *android = (android_input_t*)driver->input_data;
android_input_t *android = driver ? (android_input_t*)driver->input_data : NULL;
return (pad < MAX_USERS && pad < android->pads_connected);
}