diff --git a/settings.c b/settings.c index db0febc31d..bc8ea4e6aa 100644 --- a/settings.c +++ b/settings.c @@ -3722,35 +3722,6 @@ static bool setting_append_list_general_options( END_SUB_GROUP(list, list_info); - START_SUB_GROUP(list, list_info, "Logging", group_info.name, subgroup_info); - - CONFIG_BOOL( - global->verbosity, - "log_verbosity", - "Logging Verbosity", - false, - "OFF", - "ON", - group_info.name, - subgroup_info.name, - general_write_handler, - general_read_handler); - - - CONFIG_UINT(settings->libretro_log_level, - "libretro_log_level", - "Libretro Logging Level", - libretro_log_level, - group_info.name, - subgroup_info.name, - general_write_handler, - general_read_handler); - settings_list_current_add_range(list, list_info, 0, 3, 1.0, true, true); - (*list)[list_info->index - 1].get_string_representation = - &setting_get_string_representation_uint_libretro_log_level; - - END_SUB_GROUP(list, list_info); - START_SUB_GROUP(list, list_info, "Performance Counters", group_info.name, subgroup_info); CONFIG_BOOL(global->perfcnt_enable, @@ -3854,6 +3825,53 @@ static bool setting_append_list_general_options( return true; } +static bool setting_append_list_logging_options( + rarch_setting_t **list, + rarch_setting_info_t *list_info) +{ + rarch_setting_group_info_t group_info; + rarch_setting_group_info_t subgroup_info; + settings_t *settings = config_get_ptr(); + global_t *global = global_get_ptr(); + + START_GROUP(group_info, "Logging Settings"); + + START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); + + CONFIG_BOOL( + global->verbosity, + "log_verbosity", + "Logging Verbosity", + false, + "OFF", + "ON", + group_info.name, + subgroup_info.name, + general_write_handler, + general_read_handler); + settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); + + + CONFIG_UINT(settings->libretro_log_level, + "libretro_log_level", + "Libretro Logging Level", + libretro_log_level, + group_info.name, + subgroup_info.name, + general_write_handler, + general_read_handler); + settings_list_current_add_range(list, list_info, 0, 3, 1.0, true, true); + (*list)[list_info->index - 1].get_string_representation = + &setting_get_string_representation_uint_libretro_log_level; + settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); + + END_SUB_GROUP(list, list_info); + + END_GROUP(list, list_info); + + return true; +} + static bool setting_append_list_frame_throttling_options( rarch_setting_t **list, rarch_setting_info_t *list_info) @@ -6561,6 +6579,12 @@ rarch_setting_t *setting_new(unsigned mask) goto error; } + if (mask & SL_FLAG_LOGGING_OPTIONS) + { + if (!setting_append_list_logging_options(&list, list_info)) + goto error; + } + if (mask & SL_FLAG_REWIND_OPTIONS) { if (!setting_append_list_rewind_options(&list, list_info)) diff --git a/settings_list.h b/settings_list.h index 8b5eb36747..7875338027 100644 --- a/settings_list.h +++ b/settings_list.h @@ -88,7 +88,8 @@ enum setting_list_flags SL_FLAG_PATCH_OPTIONS = (1 << 21), SL_FLAG_RECORDING_OPTIONS = (1 << 21), SL_FLAG_FRAME_THROTTLE_OPTIONS= (1 << 22), - SL_FLAG_ALL = (1 << 23), + SL_FLAG_LOGGING_OPTIONS = (1 << 23), + SL_FLAG_ALL = (1 << 24), }; #define SL_FLAG_ALL_SETTINGS (SL_FLAG_ALL - SL_FLAG_MAIN_MENU)