From 29b8ddef2847629db8cd711e271d4aa628bc3d85 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 1 May 2019 00:09:49 +0200 Subject: [PATCH] Move video_driver_menu_settings --- gfx/video_driver.c | 97 --------------------------------------------- menu/menu_setting.c | 97 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 97 deletions(-) diff --git a/gfx/video_driver.c b/gfx/video_driver.c index ba4433b5de..0c81722e7b 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -1444,103 +1444,6 @@ void video_driver_monitor_adjust_system_rates(void) RARCH_LOG("[Video]: Game FPS > Monitor FPS. Cannot rely on VSync.\n"); } -void video_driver_menu_settings(void **list_data, void *list_info_data, - void *group_data, void *subgroup_data, const char *parent_group) -{ -#ifdef HAVE_MENU - rarch_setting_t **list = (rarch_setting_t**)list_data; - rarch_setting_info_t *list_info = (rarch_setting_info_t*)list_info_data; - rarch_setting_group_info_t *group_info = (rarch_setting_group_info_t*)group_data; - rarch_setting_group_info_t *subgroup_info = (rarch_setting_group_info_t*)subgroup_data; - global_t *global = global_get_ptr(); - - (void)list; - (void)list_info; - (void)group_info; - (void)subgroup_info; - (void)global; - -#if defined(__CELLOS_LV2__) - CONFIG_BOOL( - list, list_info, - &global->console.screen.pal60_enable, - MENU_ENUM_LABEL_PAL60_ENABLE, - MENU_ENUM_LABEL_VALUE_PAL60_ENABLE, - false, - MENU_ENUM_LABEL_VALUE_OFF, - MENU_ENUM_LABEL_VALUE_ON, - group_info, - subgroup_info, - parent_group, - general_write_handler, - general_read_handler, - SD_FLAG_NONE); -#endif -#if defined(GEKKO) || defined(_XBOX360) - CONFIG_UINT( - list, list_info, - &global->console.screen.gamma_correction, - MENU_ENUM_LABEL_VIDEO_GAMMA, - MENU_ENUM_LABEL_VALUE_VIDEO_GAMMA, - 0, - group_info, - subgroup_info, - parent_group, - general_write_handler, - general_read_handler); - menu_settings_list_current_add_cmd( - list, - list_info, - CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); - menu_settings_list_current_add_range( - list, - list_info, - 0, - MAX_GAMMA_SETTING, - 1, - true, - true); - settings_data_list_current_add_flags(list, list_info, - SD_FLAG_CMD_APPLY_AUTO|SD_FLAG_ADVANCED); -#endif -#if defined(_XBOX1) || defined(HW_RVL) - CONFIG_BOOL( - list, list_info, - &global->console.softfilter_enable, - MENU_ENUM_LABEL_VIDEO_SOFT_FILTER, - MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER, - false, - MENU_ENUM_LABEL_VALUE_OFF, - MENU_ENUM_LABEL_VALUE_ON, - group_info, - subgroup_info, - parent_group, - general_write_handler, - general_read_handler, - SD_FLAG_NONE); - menu_settings_list_current_add_cmd( - list, - list_info, - CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); -#endif -#ifdef _XBOX1 - CONFIG_UINT( - list, list_info, - &global->console.screen.flicker_filter_index, - MENU_ENUM_LABEL_VIDEO_FILTER_FLICKER, - MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_FLICKER, - 0, - group_info, - subgroup_info, - parent_group, - general_write_handler, - general_read_handler); - menu_settings_list_current_add_range(list, list_info, - 0, 5, 1, true, true); -#endif -#endif -} - static void video_driver_lock_new(void) { video_driver_lock_free(); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 05e4dcf5e7..a5c5744910 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -14437,3 +14437,100 @@ bool menu_setting_ctl(enum menu_setting_ctl_state state, void *data) return true; } + +void video_driver_menu_settings(void **list_data, void *list_info_data, + void *group_data, void *subgroup_data, const char *parent_group) +{ +#ifdef HAVE_MENU + rarch_setting_t **list = (rarch_setting_t**)list_data; + rarch_setting_info_t *list_info = (rarch_setting_info_t*)list_info_data; + rarch_setting_group_info_t *group_info = (rarch_setting_group_info_t*)group_data; + rarch_setting_group_info_t *subgroup_info = (rarch_setting_group_info_t*)subgroup_data; + global_t *global = global_get_ptr(); + + (void)list; + (void)list_info; + (void)group_info; + (void)subgroup_info; + (void)global; + +#if defined(__CELLOS_LV2__) + CONFIG_BOOL( + list, list_info, + &global->console.screen.pal60_enable, + MENU_ENUM_LABEL_PAL60_ENABLE, + MENU_ENUM_LABEL_VALUE_PAL60_ENABLE, + false, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + group_info, + subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); +#endif +#if defined(GEKKO) || defined(_XBOX360) + CONFIG_UINT( + list, list_info, + &global->console.screen.gamma_correction, + MENU_ENUM_LABEL_VIDEO_GAMMA, + MENU_ENUM_LABEL_VALUE_VIDEO_GAMMA, + 0, + group_info, + subgroup_info, + parent_group, + general_write_handler, + general_read_handler); + menu_settings_list_current_add_cmd( + list, + list_info, + CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); + menu_settings_list_current_add_range( + list, + list_info, + 0, + MAX_GAMMA_SETTING, + 1, + true, + true); + settings_data_list_current_add_flags(list, list_info, + SD_FLAG_CMD_APPLY_AUTO|SD_FLAG_ADVANCED); +#endif +#if defined(_XBOX1) || defined(HW_RVL) + CONFIG_BOOL( + list, list_info, + &global->console.softfilter_enable, + MENU_ENUM_LABEL_VIDEO_SOFT_FILTER, + MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER, + false, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + group_info, + subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + menu_settings_list_current_add_cmd( + list, + list_info, + CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); +#endif +#ifdef _XBOX1 + CONFIG_UINT( + list, list_info, + &global->console.screen.flicker_filter_index, + MENU_ENUM_LABEL_VIDEO_FILTER_FLICKER, + MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_FLICKER, + 0, + group_info, + subgroup_info, + parent_group, + general_write_handler, + general_read_handler); + menu_settings_list_current_add_range(list, list_info, + 0, 5, 1, true, true); +#endif +#endif +}