diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index b71db3b788..597a759d3f 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2168,6 +2168,7 @@ static int menu_displaylist_parse_settings_internal_enum( const char *name = setting->name; enum setting_type type = setting->type; rarch_setting_t **list = &setting; + int type_flags = 0; switch (parse_type) { @@ -2207,11 +2208,32 @@ static int menu_displaylist_parse_settings_internal_enum( goto loop; } + switch (type) + { + case ST_STRING_OPTIONS: + type_flags = MENU_SETTING_STRING_OPTIONS; + break; + case ST_ACTION: + type_flags = MENU_SETTING_ACTION; + break; + case ST_PATH: + type_flags = FILE_TYPE_PATH; + break; + case ST_GROUP: + type_flags = MENU_SETTING_GROUP; + break; + case ST_SUB_GROUP: + type_flags = MENU_SETTING_SUBGROUP; + break; + default: + break; + } + if (is_enum) menu_entries_append_enum(info_list, short_description, name, (enum msg_hash_enums)entry_type, - menu_setting_set_flags(setting), 0, 0); + type_flags, 0, 0); else { if ( @@ -2220,7 +2242,7 @@ static int menu_displaylist_parse_settings_internal_enum( ) entry_type = (unsigned)(MENU_SETTINGS_INPUT_BEGIN + count); if (entry_type == 0) - entry_type = menu_setting_set_flags(setting); + entry_type = type_flags; menu_entries_append(info_list, short_description, name, entry_type, 0, 0); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 8fb04ecc71..8c76b56a84 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -6209,30 +6209,6 @@ rarch_setting_t *menu_setting_find_enum(enum msg_hash_enums enum_idx) return NULL; } -int menu_setting_set_flags(rarch_setting_t *setting) -{ - if (!setting) - return 0; - - switch (setting->type) - { - case ST_STRING_OPTIONS: - return MENU_SETTING_STRING_OPTIONS; - case ST_ACTION: - return MENU_SETTING_ACTION; - case ST_PATH: - return FILE_TYPE_PATH; - case ST_GROUP: - return MENU_SETTING_GROUP; - case ST_SUB_GROUP: - return MENU_SETTING_SUBGROUP; - default: - break; - } - - return 0; -} - int menu_setting_set(unsigned type, unsigned action, bool wraparound) { int ret = 0; @@ -6252,23 +6228,6 @@ int menu_setting_set(unsigned type, unsigned action, bool wraparound) return ret; } -/** - * setting_get_string_representation: - * @setting : pointer to setting - * @s : buffer to write contents of string representation to. - * @len : size of the buffer (@s) - * - * Get a setting value's string representation. - **/ -void setting_get_string_representation(rarch_setting_t *setting, char *s, size_t len) -{ - if (!setting || !s) - return; - - if (setting->get_string_representation) - setting->get_string_representation(setting, s, len); -} - /** * setting_action_start_savestates: * @data : pointer to setting @@ -6577,7 +6536,7 @@ static void get_string_representation_bind_device(rarch_setting_t *setting, char strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DISABLED), len); } -void general_read_handler(rarch_setting_t *setting) +static void general_read_handler(rarch_setting_t *setting) { settings_t *settings = config_get_ptr(); @@ -6625,7 +6584,7 @@ void general_read_handler(rarch_setting_t *setting) } } -void general_write_handler(rarch_setting_t *setting) +static void general_write_handler(rarch_setting_t *setting) { enum event_command rarch_cmd = CMD_EVENT_NONE; settings_t *settings = config_get_ptr(); diff --git a/menu/menu_setting.h b/menu/menu_setting.h index 6c9de7ea44..e96f9a3f38 100644 --- a/menu/menu_setting.h +++ b/menu/menu_setting.h @@ -76,8 +76,6 @@ enum setting_list_flags int menu_setting_generic(rarch_setting_t *setting, bool wraparound); -int menu_setting_set_flags(rarch_setting_t *setting); - int menu_setting_set(unsigned type, unsigned action, bool wraparound); /** @@ -92,16 +90,6 @@ rarch_setting_t *menu_setting_find(const char *label); rarch_setting_t *menu_setting_find_enum(enum msg_hash_enums enum_idx); -/** - * setting_get_string_representation: - * @setting : pointer to setting - * @s : buffer to write contents of string representation to. - * @len : size of the buffer (@s) - * - * Get a setting value's string representation. - **/ -void menu_setting_get_string_representation(rarch_setting_t *setting, char *s, size_t len); - int menu_action_handle_setting(rarch_setting_t *setting, unsigned type, unsigned action, bool wraparound); @@ -110,10 +98,6 @@ enum setting_type menu_setting_get_browser_selection_type( void setting_generic_handle_change(rarch_setting_t *setting); -void general_write_handler(rarch_setting_t *setting); - -void general_read_handler(rarch_setting_t *setting); - void menu_setting_free(rarch_setting_t *setting); bool menu_setting_ctl(