mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_setting.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-08-17 17:55:44 +02:00
parent 97ec360eb3
commit 323a06f41f
3 changed files with 30 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
menu/menu_displaylist.c
View File

@ -1398,6 +1398,31 @@ static void menu_displaylist_realloc_settings(menu_entries_t *entries, unsigned
entries->list_settings = menu_setting_new(flags);
}
static int menu_setting_set_flags(rarch_setting_t *setting)
{
if (!setting)
return 0;
if (setting->flags & SD_FLAG_IS_DRIVER)
return MENU_SETTING_DRIVER;
switch (setting->type)
{
case ST_ACTION:
return MENU_SETTING_ACTION;
case ST_PATH:
return MENU_FILE_PATH;
case ST_GROUP:
return MENU_SETTING_GROUP;
case ST_SUB_GROUP:
return MENU_SETTING_SUBGROUP;
default:
break;
}
return 0;
}
static int menu_displaylist_parse_settings(menu_handle_t *menu,
menu_displaylist_info_t *info, unsigned setting_flags)
{

66
menu/menu_setting.c
View File

@ -69,24 +69,6 @@ static bool menu_settings_list_append(rarch_setting_t **list,
return true;
}
static void menu_settings_list_current_add_bind_type(
rarch_setting_t **list,
rarch_setting_info_t *list_info,
unsigned type)
{
unsigned idx = list_info->index - 1;
(*list)[idx].bind_type = type;
}
static void menu_settings_list_current_add_flags(
rarch_setting_t **list,
rarch_setting_info_t *list_info,
unsigned values)
{
unsigned idx = list_info->index - 1;
(*list)[idx].flags |= values;
}
static void menu_settings_list_current_add_range(
rarch_setting_t **list,
rarch_setting_info_t *list_info,
@ -101,7 +83,7 @@ static void menu_settings_list_current_add_range(
(*list)[idx].enforce_minrange = enforce_minrange_enable;
(*list)[idx].enforce_maxrange = enforce_maxrange_enable;
menu_settings_list_current_add_flags(list, list_info, SD_FLAG_HAS_RANGE);
(*list)[list_info->index - 1].flags |= SD_FLAG_HAS_RANGE;
}
static void menu_settings_list_current_add_values(
@ -122,41 +104,6 @@ static void menu_settings_list_current_add_cmd(
(*list)[idx].cmd_trigger.idx = values;
}
static rarch_setting_t *menu_setting_list_new(unsigned size)
{
rarch_setting_t *list = (rarch_setting_t*)calloc(size, sizeof(*list));
if (!list)
return NULL;
return list;
}
int menu_setting_set_flags(rarch_setting_t *setting)
{
if (!setting)
return 0;
if (setting->flags & SD_FLAG_IS_DRIVER)
return MENU_SETTING_DRIVER;
switch (setting->type)
{
case ST_ACTION:
return MENU_SETTING_ACTION;
case ST_PATH:
return MENU_FILE_PATH;
case ST_GROUP:
return MENU_SETTING_GROUP;
case ST_SUB_GROUP:
return MENU_SETTING_SUBGROUP;
default:
break;
}
return 0;
}
static int setting_generic_action_ok_default(void *data, bool wraparound)
{
rarch_setting_t *setting = (rarch_setting_t*)data;
@ -2364,10 +2311,7 @@ static void settings_data_list_current_add_flags(
rarch_setting_info_t *list_info,
unsigned values)
{
menu_settings_list_current_add_flags(
list,
list_info,
values);
(*list)[list_info->index - 1].flags |= values;
setting_add_special_callbacks(list, list_info, values);
}
@ -4112,7 +4056,7 @@ static bool setting_append_list_input_hotkey_options(
CONFIG_BIND(settings->input.binds[0][i], 0, 0,
strdup(keybind->base), strdup(keybind->desc), &retro_keybinds_1[i],
group_info.name, subgroup_info.name, parent_group);
menu_settings_list_current_add_bind_type(list, list_info, i + MENU_SETTINGS_BIND_BEGIN);
(*list)[list_info->index - 1].bind_type = i + MENU_SETTINGS_BIND_BEGIN;
}
END_SUB_GROUP(list, list_info, parent_group);
@ -6049,7 +5993,7 @@ static bool setting_append_list_input_player_options(
group_info.name,
subgroup_info.name,
parent_group);
menu_settings_list_current_add_bind_type(list, list_info, i + MENU_SETTINGS_BIND_BEGIN);
(*list)[list_info->index - 1].bind_type = i + MENU_SETTINGS_BIND_BEGIN;
}
}
@ -6106,7 +6050,7 @@ rarch_setting_t *menu_setting_new(unsigned mask)
return NULL;
list_info->size = 32;
list = menu_setting_list_new(list_info->size);
list = (rarch_setting_t*)calloc(list_info->size, sizeof(*list));
if (!list)
goto error;

2
menu/menu_setting.h
View File

@ -211,8 +211,6 @@ typedef struct rarch_setting
bool enforce_maxrange;
} rarch_setting_t;
int menu_setting_set_flags(rarch_setting_t *setting);
int menu_setting_generic(rarch_setting_t *setting, bool wraparound);
int menu_setting_set(unsigned type, const char *label,