libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

[Android] clear bindings on context reset, they end up getting rebound anyway

Browse Source 
bump version
This commit is contained in:
Toad King 2015-07-02 23:06:53 -05:00
parent d0866995bd
commit 26b4dc79d0
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/phoenix/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.retroarch"
android:versionCode="37"
android:versionName="1.0.0.3" >
android:versionName="1.2" android:installLocation="preferExternal">
<uses-feature android:glEsVersion="0x00020000" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<uses-sdk

6
input/drivers/android_input.c
View File

@ -738,10 +738,10 @@ static void handle_hotplug(android_input_t *android,
strlcpy(android->pad_states[*port].name, name_buf,
sizeof(android->pad_states[*port].name));
if (!autoconfigured)
{
if (autoconfigured && strcmp(name_buf, "RetroKeyboard"))
settings->input.binds[*port][RARCH_MENU_TOGGLE].joykey = 0;
else
settings->input.binds[*port][RARCH_MENU_TOGGLE].joykey = AKEYCODE_BACK;
}
android->pads_connected++;
}

17
input/drivers_joypad/android_joypad.c
View File

@ -26,26 +26,11 @@ static bool android_joypad_init(void *data)
{
unsigned autoconf_pad;
settings_t *settings = config_get_ptr();
autoconfig_params_t params = {{0}};
(void)data;
for (autoconf_pad = 0; autoconf_pad < MAX_USERS; autoconf_pad++)
{
strlcpy(settings->input.device_names[autoconf_pad],
android_joypad_name(autoconf_pad),
sizeof(settings->input.device_names[autoconf_pad]));
/* TODO - implement VID/PID? */
params.idx = autoconf_pad;
strlcpy(params.name, android_joypad_name(autoconf_pad), sizeof(params.name));
strlcpy(params.driver, android_joypad.ident, sizeof(params.driver));
if (!input_config_autoconfigure_joypad(&params))
{
settings->input.binds[autoconf_pad][RARCH_MENU_TOGGLE].joykey = AKEYCODE_BACK;
}
}
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)