From c2ec82b996e17d1636df536e3c014bf81705c73d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 8 Sep 2014 03:34:36 +0200 Subject: [PATCH] (Input) Add two input options - input_duty_cycle/input_turbo_period --- frontend/menu/menu_entries.c | 6 +++--- settings_data.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c index 8c6a274ffb..4755c4b6c9 100644 --- a/frontend/menu/menu_entries.c +++ b/frontend/menu/menu_entries.c @@ -441,6 +441,8 @@ int menu_entries_push_list(menu_handle_t *menu, MENU_SETTINGS_BIND_ANALOG_MODE, 0); add_setting_entry(menu,list,"input_axis_threshold", 0, setting_data); add_setting_entry(menu,list,"input_autodetect_enable", 0, setting_data); + add_setting_entry(menu,list,"input_turbo_period", 0, setting_data); + add_setting_entry(menu,list,"input_duty_cycle", 0, setting_data); file_list_push(list, "Bind Mode", "", MENU_SETTINGS_CUSTOM_BIND_MODE, 0); file_list_push(list, "Configure All (RetroPad)", "", @@ -449,9 +451,7 @@ int menu_entries_push_list(menu_handle_t *menu, MENU_SETTINGS_CUSTOM_BIND_DEFAULT_ALL, 0); add_setting_entry(menu,list,"osk_enable", 0, setting_data); for (i = MENU_SETTINGS_BIND_BEGIN; i <= MENU_SETTINGS_BIND_ALL_LAST; i++) - file_list_push(list, - input_config_bind_map[i - MENU_SETTINGS_BIND_BEGIN].desc, - "", i, 0); + add_setting_entry(menu, list, input_config_bind_map[i - MENU_SETTINGS_BIND_BEGIN].base, i, setting_data); } else if (!strcmp(label, "Driver Options")) { diff --git a/settings_data.c b/settings_data.c index a484558610..154898b00c 100644 --- a/settings_data.c +++ b/settings_data.c @@ -2319,8 +2319,8 @@ rarch_setting_t *setting_data_get_list(void) START_SUB_GROUP("Turbo/Deadzone") CONFIG_FLOAT(g_settings.input.axis_threshold, "input_axis_threshold", "Input Axis Threshold", axis_threshold, "%.3f", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) - CONFIG_UINT(g_settings.input.turbo_period, "input_turbo_period", "Turbo Period", turbo_period, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) - CONFIG_UINT(g_settings.input.turbo_duty_cycle, "input_duty_cycle", "Duty Cycle", turbo_duty_cycle, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) + CONFIG_UINT(g_settings.input.turbo_period, "input_turbo_period", "Turbo Period", turbo_period, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_RANGE(1, 0, 1, true, false) + CONFIG_UINT(g_settings.input.turbo_duty_cycle, "input_duty_cycle", "Duty Cycle", turbo_duty_cycle, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_RANGE(1, 0, 1, true, false) END_SUB_GROUP() // The second argument to config bind is 1 based for players and 0 only for meta keys