diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index 174994f7cf..be7d3835dc 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -414,7 +414,7 @@ static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs, if (cbs->setting) { - const char *parent_group = menu_setting_get_parent_group(cbs->setting); + const char *parent_group = cbs->setting->parent_group; if (string_is_equal(parent_group, msg_hash_to_str(MENU_ENUM_LABEL_MAIN_MENU)) && (cbs->setting->type == ST_GROUP)) diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index 2cda0edadb..bda29d7eb3 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -523,7 +523,7 @@ static int menu_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs, if (cbs->setting) { - const char *parent_group = menu_setting_get_parent_group(cbs->setting); + const char *parent_group = cbs->setting->parent_group; if (string_is_equal(parent_group, msg_hash_to_str(MENU_ENUM_LABEL_MAIN_MENU)) && (cbs->setting->type == ST_GROUP)) diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c index 74a244fd06..c944aeb1e0 100644 --- a/menu/cbs/menu_cbs_select.c +++ b/menu/cbs/menu_cbs_select.c @@ -212,7 +212,7 @@ int menu_cbs_init_bind_select(menu_file_list_cbs_t *cbs, if (cbs->setting) { - uint64_t flags = setting_get_flags(cbs->setting); + uint64_t flags = cbs->setting->flags; if (flags & SD_FLAG_IS_DRIVER) { diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 79f8fb52f6..e5e3c67239 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -896,7 +896,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, { if (cbs->setting) { - const char *parent_group = menu_setting_get_parent_group(cbs->setting); + const char *parent_group = cbs->setting->parent_group; if (string_is_equal(parent_group, msg_hash_to_str(MENU_ENUM_LABEL_MAIN_MENU)) && cbs->setting->type == ST_GROUP) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 15ed7ecb5a..bc845edc9f 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2160,12 +2160,14 @@ static int menu_displaylist_parse_settings_internal(void *data, { enum setting_type precond; size_t count = 0; + uint64_t flags = 0; settings_t *settings = config_get_ptr(); - uint64_t flags = setting_get_flags(setting); if (!setting) return -1; + flags = setting->flags; + switch (parse_type) { case PARSE_GROUP: @@ -2215,7 +2217,7 @@ static int menu_displaylist_parse_settings_internal(void *data, { bool time_to_exit = false; const char *short_description = setting->short_description; - const char *name = menu_setting_get_name(setting); + const char *name = setting->name; enum setting_type type = setting->type; rarch_setting_t **list = &setting; @@ -2345,12 +2347,14 @@ static int menu_displaylist_parse_settings_internal_enum(void *data, { enum setting_type precond; size_t count = 0; + uint64_t flags = 0; settings_t *settings = config_get_ptr(); - uint64_t flags = setting_get_flags(setting); if (!setting) return -1; + flags = setting->flags; + switch (parse_type) { case PARSE_GROUP: @@ -2400,7 +2404,7 @@ static int menu_displaylist_parse_settings_internal_enum(void *data, { bool time_to_exit = false; const char *short_description = setting->short_description; - const char *name = menu_setting_get_name(setting); + const char *name = setting->name; enum setting_type type = setting->type; rarch_setting_t **list = &setting; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index aba261d5c0..f90ef0cfd8 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -530,7 +530,7 @@ void menu_settings_list_current_add_enum_idx( int menu_setting_generic(rarch_setting_t *setting, bool wraparound) { - uint64_t flags = setting_get_flags(setting); + uint64_t flags = setting->flags; if (setting_generic_action_ok_default(setting, wraparound) != 0) return -1; @@ -604,7 +604,7 @@ int menu_action_handle_setting(rarch_setting_t *setting, size_t selection; menu_displaylist_info_t info = {0}; file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); - const char *name = menu_setting_get_name(setting); + const char *name = setting->name; if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) return -1; @@ -640,34 +640,6 @@ int menu_action_handle_setting(rarch_setting_t *setting, return -1; } -const char *menu_setting_get_values(rarch_setting_t *setting) -{ - if (!setting) - return NULL; - return setting->values; -} - -enum msg_hash_enums menu_setting_get_enum_idx(rarch_setting_t *setting) -{ - if (!setting) - return MSG_UNKNOWN; - return setting->enum_idx; -} - -const char *menu_setting_get_name(rarch_setting_t *setting) -{ - if (!setting) - return NULL; - return setting->name; -} - -const char *menu_setting_get_parent_group(rarch_setting_t *setting) -{ - if (!setting) - return NULL; - return setting->parent_group; -} - static rarch_setting_t *menu_setting_find_internal(rarch_setting_t *setting, const char *label) { @@ -678,7 +650,7 @@ static rarch_setting_t *menu_setting_find_internal(rarch_setting_t *setting, { if (needle == setting->name_hash && setting->type <= ST_GROUP) { - const char *name = menu_setting_get_name(setting); + const char *name = setting->name; const char *short_description = setting->short_description; /* make sure this isn't a collision */ if (!string_is_equal(label, name)) @@ -1469,7 +1441,7 @@ void general_write_handler(void *data) if (setting->cmd_trigger.idx != CMD_EVENT_NONE) { - uint64_t flags = setting_get_flags(setting); + uint64_t flags = setting->flags; if (flags & SD_FLAG_EXIT) { @@ -6838,7 +6810,7 @@ bool menu_setting_ctl(enum menu_setting_ctl_state state, void *data) if (!setting) return false; - flags = setting_get_flags(setting); + flags = setting->flags; if (setting->type != ST_ACTION) return false; diff --git a/menu/menu_setting.h b/menu/menu_setting.h index f7a0f44b20..700928508a 100644 --- a/menu/menu_setting.h +++ b/menu/menu_setting.h @@ -125,16 +125,6 @@ int menu_action_handle_setting(rarch_setting_t *setting, enum setting_type menu_setting_get_browser_selection_type(rarch_setting_t *setting); -enum msg_hash_enums menu_setting_get_enum_idx(rarch_setting_t *setting); - -const char *menu_setting_get_values(rarch_setting_t *setting); - -const char *menu_setting_get_name(rarch_setting_t *setting); - -const char *menu_setting_get_parent_group(rarch_setting_t *setting); - -uint32_t menu_setting_get_index(rarch_setting_t *setting); - void *setting_get_ptr(rarch_setting_t *setting); void general_write_handler(void *data); diff --git a/menu/widgets/menu_entry.c b/menu/widgets/menu_entry.c index 6b104a0944..cecb2c120f 100644 --- a/menu/widgets/menu_entry.c +++ b/menu/widgets/menu_entry.c @@ -215,7 +215,7 @@ uint32_t menu_entry_get_bool_value(uint32_t i) struct string_list *menu_entry_enum_values(uint32_t i) { rarch_setting_t *setting = menu_entries_get_setting(i); - const char *values = menu_setting_get_values(setting); + const char *values = setting->values; if (!values) return NULL; @@ -276,7 +276,7 @@ void menu_entry_pathdir_selected(uint32_t i) bool menu_entry_pathdir_allow_empty(uint32_t i) { rarch_setting_t *setting = menu_entries_get_setting(i); - uint64_t flags = setting_get_flags(setting); + uint64_t flags = setting->flags; return flags & SD_FLAG_ALLOW_EMPTY; } @@ -284,7 +284,7 @@ bool menu_entry_pathdir_allow_empty(uint32_t i) uint32_t menu_entry_pathdir_for_directory(uint32_t i) { rarch_setting_t *setting = menu_entries_get_setting(i); - uint64_t flags = setting_get_flags(setting); + uint64_t flags = setting->flags; return flags & SD_FLAG_PATH_DIR; } @@ -311,7 +311,7 @@ void menu_entry_pathdir_get_value(uint32_t i, char *s, size_t len) void menu_entry_pathdir_extensions(uint32_t i, char *s, size_t len) { rarch_setting_t *setting = menu_entries_get_setting(i); - const char *values = menu_setting_get_values(setting); + const char *values = setting->values; if (!values) return; @@ -368,7 +368,7 @@ void menu_entry_set_value(uint32_t i, const char *s) uint32_t menu_entry_num_has_range(uint32_t i) { rarch_setting_t *setting = menu_entries_get_setting(i); - uint64_t flags = setting_get_flags(setting); + uint64_t flags = setting->flags; return (flags & SD_FLAG_HAS_RANGE); } @@ -376,14 +376,14 @@ uint32_t menu_entry_num_has_range(uint32_t i) float menu_entry_num_min(uint32_t i) { rarch_setting_t *setting = menu_entries_get_setting(i); - double min = setting_get_min(setting); + double min = setting->min; return (float)min; } float menu_entry_num_max(uint32_t i) { rarch_setting_t *setting = menu_entries_get_setting(i); - double max = setting_get_max(setting); + double max = setting->max; return (float)max; } diff --git a/setting_list.c b/setting_list.c index 358e9f57a0..e79cad8595 100644 --- a/setting_list.c +++ b/setting_list.c @@ -101,13 +101,6 @@ bool settings_list_append(rarch_setting_t **list, return true; } -uint64_t setting_get_flags(rarch_setting_t *setting) -{ - if (!setting) - return 0; - return setting->flags; -} - uint32_t setting_get_index(rarch_setting_t *setting) { if (!setting) @@ -144,12 +137,15 @@ static int setting_bind_action_ok(void *data, bool wraparound) static int setting_int_action_right_default(void *data, bool wraparound) { rarch_setting_t *setting = (rarch_setting_t*)data; - double min = setting_get_min(setting); - double max = setting_get_max(setting); - + double min = 0.0f; + double max = 0.0f; + if (!setting) return -1; + min = setting->min; + max = setting->max; + (void)wraparound; /* TODO/FIXME - handle this */ *setting->value.target.integer = @@ -222,11 +218,13 @@ static void setting_get_string_representation_uint(void *data, static int setting_uint_action_left_default(void *data, bool wraparound) { rarch_setting_t *setting = (rarch_setting_t*)data; - double min = setting_get_min(setting); - + double min = 0.0f; + if (!setting) return -1; + min = setting->min; + (void)wraparound; /* TODO/FIXME - handle this */ if (*setting->value.target.unsigned_integer != min) @@ -246,14 +244,18 @@ static int setting_uint_action_left_default(void *data, bool wraparound) static int setting_uint_action_right_default(void *data, bool wraparound) { rarch_setting_t *setting = (rarch_setting_t*)data; - double min = setting_get_min(setting); - double max = setting_get_max(setting); - + double min = 0.0f; + double max = 0.0f; + if (!setting) return -1; + min = setting->min; + max = setting->max; + (void)wraparound; /* TODO/FIXME - handle this */ + *setting->value.target.unsigned_integer = *setting->value.target.unsigned_integer + setting->step; @@ -299,20 +301,6 @@ static void setting_get_string_representation_int(void *data, snprintf(s, len, "%d", *setting->value.target.integer); } -double setting_get_min(rarch_setting_t *setting) -{ - if (!setting) - return 0.0f; - return setting->min; -} - -double setting_get_max(rarch_setting_t *setting) -{ - if (!setting) - return 0.0f; - return setting->max; -} - /** * setting_set_with_string_representation: * @setting : pointer to setting @@ -329,13 +317,13 @@ int setting_set_with_string_representation(rarch_setting_t* setting, if (!setting || !value) return -1; - min = setting_get_min(setting); - max = setting_get_max(setting); + min = setting->min; + max = setting->max; + flags = setting->flags; switch (setting->type) { case ST_INT: - flags = setting_get_flags(setting); sscanf(value, "%d", setting->value.target.integer); if (flags & SD_FLAG_HAS_RANGE) { @@ -355,7 +343,6 @@ int setting_set_with_string_representation(rarch_setting_t* setting, } break; case ST_UINT: - flags = setting_get_flags(setting); sscanf(value, "%u", setting->value.target.unsigned_integer); if (flags & SD_FLAG_HAS_RANGE) { @@ -375,7 +362,6 @@ int setting_set_with_string_representation(rarch_setting_t* setting, } break; case ST_FLOAT: - flags = setting_get_flags(setting); sscanf(value, "%f", setting->value.target.fraction); if (flags & SD_FLAG_HAS_RANGE) { @@ -421,11 +407,13 @@ static int setting_fraction_action_left_default( void *data, bool wraparound) { rarch_setting_t *setting = (rarch_setting_t*)data; - double min = setting_get_min(setting); - + double min = 0.0f; + if (!setting) return -1; + min = setting->min; + (void)wraparound; /* TODO/FIXME - handle this */ *setting->value.target.fraction = @@ -444,12 +432,15 @@ static int setting_fraction_action_right_default( void *data, bool wraparound) { rarch_setting_t *setting = (rarch_setting_t*)data; - double min = setting_get_min(setting); - double max = setting_get_max(setting); + double min = 0.0f; + double max = 0.0f; if (!setting) return -1; + min = setting->min; + max = setting->min; + (void)wraparound; /* TODO/FIXME - handle this */ *setting->value.target.fraction = @@ -1056,12 +1047,14 @@ static rarch_setting_t setting_bind_setting(const char* name, static int setting_int_action_left_default(void *data, bool wraparound) { + double min = 0.0f; rarch_setting_t *setting = (rarch_setting_t*)data; - double min = setting_get_min(setting); if (!setting) return -1; + min = setting->min; + (void)wraparound; /* TODO/FIXME - handle this */ if (*setting->value.target.integer != min) diff --git a/setting_list.h b/setting_list.h index de44f2f6ae..34649c9423 100644 --- a/setting_list.h +++ b/setting_list.h @@ -341,12 +341,6 @@ unsigned setting_get_index_offset(rarch_setting_t *setting); uint32_t setting_get_index(rarch_setting_t *setting); -uint64_t setting_get_flags(rarch_setting_t *setting); - -double setting_get_min(rarch_setting_t *setting); - -double setting_get_max(rarch_setting_t *setting); - unsigned setting_get_bind_type(rarch_setting_t *setting); int setting_string_action_start_generic(void *data);