From d1f8ee6132742f264d584bc24f08b29cb91369bd Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 11 Jun 2014 00:41:48 +0200 Subject: [PATCH] (Android) Take out bad Android input hacks --- general.h | 5 ----- settings.c | 19 ------------------- settings_data.c | 10 ---------- 3 files changed, 34 deletions(-) diff --git a/general.h b/general.h index 5765689422..25bd66633a 100644 --- a/general.h +++ b/general.h @@ -277,11 +277,6 @@ struct settings char device_names[MAX_PLAYERS][64]; bool debug_enable; bool autodetect_enable; -#ifdef ANDROID - unsigned back_behavior; - unsigned icade_profile[MAX_PLAYERS]; - unsigned icade_count; -#endif bool netplay_client_swap_input; unsigned turbo_period; diff --git a/settings.c b/settings.c index 5bb27b7331..ae1edf94cb 100644 --- a/settings.c +++ b/settings.c @@ -381,9 +381,6 @@ void config_set_defaults(void) g_settings.input.debug_enable = input_debug_enable; g_settings.input.autodetect_enable = input_autodetect_enable; *g_settings.input.keyboard_layout = '\0'; -#ifdef ANDROID - g_settings.input.back_behavior = BACK_BUTTON_QUIT; -#endif for (i = 0; i < MAX_PLAYERS; i++) { @@ -1106,14 +1103,6 @@ bool config_load_file(const char *path, bool set_defaults) CONFIG_GET_INT_EXTERN(netplay_port, "netplay_ip_port"); #endif -#ifdef ANDROID - CONFIG_GET_INT(input.back_behavior, "input_back_behavior"); - CONFIG_GET_INT(input.icade_profile[0], "input_autodetect_icade_profile_pad1"); - CONFIG_GET_INT(input.icade_profile[1], "input_autodetect_icade_profile_pad2"); - CONFIG_GET_INT(input.icade_profile[2], "input_autodetect_icade_profile_pad3"); - CONFIG_GET_INT(input.icade_profile[3], "input_autodetect_icade_profile_pad4"); -#endif - CONFIG_GET_BOOL_EXTERN(config_save_on_exit, "config_save_on_exit"); if (!g_extern.has_set_save_path && config_get_path(conf, "savefile_directory", tmp_str, sizeof(tmp_str))) @@ -1439,14 +1428,6 @@ bool config_save_file(const char *path) config_set_float(conf, "input_overlay_scale", g_settings.input.overlay_scale); #endif -#ifdef ANDROID - config_set_int(conf, "input_back_behavior", g_settings.input.back_behavior); - config_set_int(conf, "input_autodetect_icade_profile_pad1", g_settings.input.icade_profile[0]); - config_set_int(conf, "input_autodetect_icade_profile_pad2", g_settings.input.icade_profile[1]); - config_set_int(conf, "input_autodetect_icade_profile_pad3", g_settings.input.icade_profile[2]); - config_set_int(conf, "input_autodetect_icade_profile_pad4", g_settings.input.icade_profile[3]); -#endif - config_set_bool(conf, "gamma_correction", g_extern.console.screen.gamma_correction); #ifdef _XBOX1 config_set_int(conf, "sound_volume_level", g_extern.console.sound.volume_level); diff --git a/settings_data.c b/settings_data.c index 478f04dfcc..9b860535ed 100644 --- a/settings_data.c +++ b/settings_data.c @@ -679,16 +679,6 @@ const rarch_setting_t* setting_data_get_list(void) END_SUB_GROUP() #endif -#ifdef ANDROID - START_SUB_GROUP("Android") - CONFIG_UINT(g_settings.input.back_behavior, "input_back_behavior", "Back Behavior", BACK_BUTTON_QUIT) - CONFIG_UINT(g_settings.input.icade_profile[0], "input_autodetect_icade_profile_pad1", "iCade 1", DEFAULT_ME_YO) - CONFIG_UINT(g_settings.input.icade_profile[1], "input_autodetect_icade_profile_pad2", "iCade 2", DEFAULT_ME_YO) - CONFIG_UINT(g_settings.input.icade_profile[2], "input_autodetect_icade_profile_pad3", "iCade 3", DEFAULT_ME_YO) - CONFIG_UINT(g_settings.input.icade_profile[3], "input_autodetect_icade_profile_pad4", "iCade 4", DEFAULT_ME_YO) - END_SUB_GROUP() -#endif - // The second argument to config bind is 1 based for players and 0 only for meta keys START_SUB_GROUP("Meta Keys") for (i = 0; i != RARCH_BIND_LIST_END; i ++)