CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-21 10:20:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Android) Take out bad Android input hacks

Browse Source
This commit is contained in:
twinaphex 2014-06-11 00:41:48 +02:00
parent 406dc253eb
commit d1f8ee6132
3 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
general.h
View File

@ -277,11 +277,6 @@ struct settings
char device_names[MAX_PLAYERS][64]; char device_names[MAX_PLAYERS][64];
bool debug_enable; bool debug_enable;
bool autodetect_enable; bool autodetect_enable;
#ifdef ANDROID
unsigned back_behavior;
unsigned icade_profile[MAX_PLAYERS];
unsigned icade_count;
#endif
bool netplay_client_swap_input; bool netplay_client_swap_input;
unsigned turbo_period; unsigned turbo_period;

19
settings.c
View File

@ -381,9 +381,6 @@ void config_set_defaults(void)
g_settings.input.debug_enable = input_debug_enable; g_settings.input.debug_enable = input_debug_enable;
g_settings.input.autodetect_enable = input_autodetect_enable; g_settings.input.autodetect_enable = input_autodetect_enable;
*g_settings.input.keyboard_layout = '\0'; *g_settings.input.keyboard_layout = '\0';
#ifdef ANDROID
g_settings.input.back_behavior = BACK_BUTTON_QUIT;
#endif
for (i = 0; i < MAX_PLAYERS; i++) 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"); CONFIG_GET_INT_EXTERN(netplay_port, "netplay_ip_port");
#endif #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"); 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))) 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); config_set_float(conf, "input_overlay_scale", g_settings.input.overlay_scale);
#endif #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); config_set_bool(conf, "gamma_correction", g_extern.console.screen.gamma_correction);
#ifdef _XBOX1 #ifdef _XBOX1
config_set_int(conf, "sound_volume_level", g_extern.console.sound.volume_level); config_set_int(conf, "sound_volume_level", g_extern.console.sound.volume_level);

10
settings_data.c
View File

@ -679,16 +679,6 @@ const rarch_setting_t* setting_data_get_list(void)
END_SUB_GROUP() END_SUB_GROUP()
#endif #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 // The second argument to config bind is 1 based for players and 0 only for meta keys
START_SUB_GROUP("Meta Keys") START_SUB_GROUP("Meta Keys")
for (i = 0; i != RARCH_BIND_LIST_END; i ++) for (i = 0; i != RARCH_BIND_LIST_END; i ++)