From dd04705d25aacb650508e82073e060b331eb326d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 15 Jun 2016 17:13:04 +0200 Subject: [PATCH] Turn menu_settings_list_current_add_enum_idx into public scope function so we can use it in gfx/video_driver.c --- gfx/video_driver.c | 5 +++++ menu/menu_setting.c | 2 +- menu/menu_setting.h | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 8856d36376..beaecf8193 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -1191,6 +1191,7 @@ void video_driver_menu_settings(void **list_data, void *list_info_data, group_info, subgroup_info, parent_group); + menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_SCREEN_RESOLUTION); #endif #if defined(__CELLOS_LV2__) CONFIG_BOOL( @@ -1206,6 +1207,7 @@ void video_driver_menu_settings(void **list_data, void *list_info_data, parent_group, general_write_handler, general_read_handler); + menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_PAL60_ENABLE); #endif #if defined(GEKKO) || defined(_XBOX360) CONFIG_UINT( @@ -1233,6 +1235,7 @@ void video_driver_menu_settings(void **list_data, void *list_info_data, true); settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO|SD_FLAG_ADVANCED); + menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_VIDEO_GAMMA); #endif #if defined(_XBOX1) || defined(HW_RVL) CONFIG_BOOL( @@ -1252,6 +1255,7 @@ void video_driver_menu_settings(void **list_data, void *list_info_data, list, list_info, CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); + menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_VIDEO_SOFT_FILTER); #endif #ifdef _XBOX1 CONFIG_UINT( @@ -1266,6 +1270,7 @@ void video_driver_menu_settings(void **list_data, void *list_info_data, general_write_handler, general_read_handler); menu_settings_list_current_add_range(list, list_info, 0, 5, 1, true, true); + menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_VIDEO_FILTER_FLICKER); #endif #endif } diff --git a/menu/menu_setting.c b/menu/menu_setting.c index f5a881c364..0c5888d5cf 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -1833,7 +1833,7 @@ void menu_settings_list_current_add_cmd( (*list)[idx].cmd_trigger.idx = values; } -static void menu_settings_list_current_add_enum_idx( +void menu_settings_list_current_add_enum_idx( rarch_setting_t **list, rarch_setting_info_t *list_info, enum menu_hash_enums enum_idx) diff --git a/menu/menu_setting.h b/menu/menu_setting.h index 9e5b5395a9..07bc4b176d 100644 --- a/menu/menu_setting.h +++ b/menu/menu_setting.h @@ -386,6 +386,11 @@ void settings_data_list_current_add_free_flags( rarch_setting_info_t *list_info, unsigned values); +void menu_settings_list_current_add_enum_idx( + rarch_setting_t **list, + rarch_setting_info_t *list_info, + enum menu_hash_enums enum_idx); + bool menu_setting_ctl(enum menu_setting_ctl_state state, void *data); RETRO_END_DECLS