diff --git a/configuration.c b/configuration.c index 06a0e3092b..7b55d5cd30 100644 --- a/configuration.c +++ b/configuration.c @@ -607,7 +607,6 @@ static void config_set_defaults(void) settings->input.remap_binds_enable = true; settings->input.max_users = input_max_users; settings->input.menu_toggle_gamepad_combo = menu_toggle_gamepad_combo; - settings->input.bind_mode = 0; retro_assert(sizeof(settings->input.binds[0]) >= sizeof(retro_keybinds_1)); retro_assert(sizeof(settings->input.binds[1]) >= sizeof(retro_keybinds_rest)); @@ -1645,8 +1644,6 @@ static bool config_load_file(const char *path, bool set_defaults) CONFIG_GET_PATH_BASE(conf, settings, content_history_path, "content_history_path"); CONFIG_GET_INT_BASE(conf, settings, content_history_size, "content_history_size"); - CONFIG_GET_INT_BASE(conf, settings, input.bind_mode, "input_bind_mode"); - CONFIG_GET_INT_BASE(conf, settings, input.turbo_period, "input_turbo_period"); CONFIG_GET_INT_BASE(conf, settings, input.turbo_duty_cycle, "input_duty_cycle"); @@ -2475,7 +2472,6 @@ bool config_save_file(const char *path) config_set_path(conf, "cheat_database_path", settings->cheat_database); config_set_path(conf, "cursor_directory", settings->cursor_directory); config_set_path(conf, "content_history_dir", settings->content_history_directory); - config_set_int(conf, "input_bind_mode", settings->input.bind_mode); config_set_bool(conf, "rewind_enable", settings->rewind_enable); config_set_int(conf, "audio_latency", settings->audio.latency); config_set_bool(conf, "audio_sync", settings->audio.sync); diff --git a/configuration.h b/configuration.h index 5da6e54b22..63adb7c4fd 100644 --- a/configuration.h +++ b/configuration.h @@ -251,7 +251,6 @@ typedef struct settings unsigned menu_toggle_gamepad_combo; bool back_as_menu_toggle_enable; - unsigned bind_mode; } input; struct diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 2bd374c522..a4b9b50dca 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -350,35 +350,6 @@ static void menu_action_setting_disp_set_label_shader_scale_pass( #endif } -static void menu_action_setting_disp_set_label_input_bind_mode( - file_list_t* list, - unsigned *w, unsigned type, unsigned i, - const char *label, - char *s, size_t len, - const char *entry_label, - const char *path, - char *s2, size_t len2) -{ - settings_t *settings = config_get_ptr(); - - *w = 19; - - switch (settings->input.bind_mode) - { - case 0: - strlcpy(s, "Auto", len); - break; - case 1: - strlcpy(s, "RetroKeyboard", len); - break; - case 2: - strlcpy(s, "RetroPad", len); - break; - } - - strlcpy(s2, menu_hash_to_str(MENU_LABEL_VALUE_INPUT_BIND_MODE), len2); -} - static void menu_action_setting_disp_set_label_menu_file_core( file_list_t* list, unsigned *w, unsigned type, unsigned i, @@ -1034,10 +1005,6 @@ static int menu_cbs_init_bind_get_string_representation_compare_label( BIND_ACTION_GET_VALUE(cbs, menu_action_setting_disp_set_label_state); break; - case MENU_LABEL_INPUT_BIND_MODE: - BIND_ACTION_GET_VALUE(cbs, - menu_action_setting_disp_set_label_input_bind_mode); - break; case MENU_LABEL_INPUT_MENU_TOGGLE_GAMEPAD_COMBO: BIND_ACTION_GET_VALUE(cbs, menu_action_setting_disp_set_label_menu_toggle_gamepad_combo); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index ed3bbfc43a..8310855524 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5069,18 +5069,6 @@ static bool setting_append_list_input_options( menu_settings_list_current_add_range(list, list_info, 1, 0, 1, true, false); settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); - CONFIG_UINT( - settings->input.bind_mode, - menu_hash_to_str(MENU_LABEL_INPUT_BIND_MODE), - menu_hash_to_str(MENU_LABEL_VALUE_INPUT_BIND_MODE), - 0, - group_info.name, - subgroup_info.name, - parent_group, - general_write_handler, - general_read_handler); - menu_settings_list_current_add_range(list, list_info, 0, 2, 1, true, true); - END_SUB_GROUP(list, list_info, parent_group); START_SUB_GROUP(list, list_info, "Binds", group_info.name, subgroup_info, parent_group);