ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename setting_data_get_list to setting_data_new

This commit is contained in:
twinaphex 2014-10-11 04:59:03 +02:00
parent 03a9148db3
commit 77f43c78e5
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/menu/menu_common.c
View File

@ -188,8 +188,8 @@ bool menu_init_list(void *data)
if (!menu)
return false;
menu->list_mainmenu = setting_data_get_list(SL_FLAG_MAIN_MENU);
menu->list_settings = setting_data_get_list(SL_FLAG_ALL_SETTINGS);
menu->list_mainmenu = setting_data_new(SL_FLAG_MAIN_MENU);
menu->list_settings = setting_data_new(SL_FLAG_ALL_SETTINGS);
file_list_push(menu->menu_stack, "", "mainmenu", MENU_SETTINGS, 0);
menu_clear_navigation(menu);

13
frontend/menu/menu_entries.c
View File

@ -179,8 +179,7 @@ int menu_entries_push_list(menu_handle_t *menu,
if (!strcmp(label, "mainmenu"))
{
settings_list_free(menu->list_mainmenu);
menu->list_mainmenu = (rarch_setting_t *)
setting_data_get_list(SL_FLAG_MAIN_MENU);
menu->list_mainmenu = (rarch_setting_t *)setting_data_new(SL_FLAG_MAIN_MENU);
rarch_setting_t *setting = (rarch_setting_t*)setting_data_find_setting(menu->list_mainmenu, "Main Menu");
file_list_clear(list);
@ -201,8 +200,7 @@ int menu_entries_push_list(menu_handle_t *menu,
else if (menu_type == MENU_FILE_CATEGORY)
{
settings_list_free(menu->list_settings);
menu->list_settings = (rarch_setting_t *)
setting_data_get_list(SL_FLAG_ALL_SETTINGS);
menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_ALL_SETTINGS);
rarch_setting_t *setting = (rarch_setting_t*)setting_data_find_setting(menu->list_settings,
label);
@ -234,8 +232,7 @@ int menu_entries_push_list(menu_handle_t *menu,
else if (!strcmp(label, "settings"))
{
settings_list_free(menu->list_settings);
menu->list_settings = (rarch_setting_t *)
setting_data_get_list(SL_FLAG_ALL_SETTINGS);
menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_ALL_SETTINGS);
rarch_setting_t *setting = (rarch_setting_t*)setting_data_find_setting(menu->list_settings,
"Driver Options");
@ -429,8 +426,8 @@ int menu_entries_push_list(menu_handle_t *menu,
else if (!strcmp(label, "Input Options"))
{
settings_list_free(menu->list_settings);
menu->list_settings = (rarch_setting_t *)
setting_data_get_list(SL_FLAG_ALL_SETTINGS);
menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_ALL_SETTINGS);
file_list_clear(list);
file_list_push(list, "Player", "input_bind_player_no", 0, 0);
file_list_push(list, "Device", "input_bind_device_id", 0, 0);

2
settings_data.c
View File

@ -4548,7 +4548,7 @@ bool setting_data_append_list_privacy_options(
return true;
}
rarch_setting_t *setting_data_get_list(unsigned mask)
rarch_setting_t *setting_data_new(unsigned mask)
{
rarch_setting_t terminator = { ST_NONE };
rarch_setting_t* list = NULL;

3
settings_data.h
View File

@ -91,7 +91,8 @@ void setting_data_get_label(char *type_str,
size_t type_str_size, unsigned *w, unsigned type,
const char *menu_label, const char *label, unsigned index);
#endif
rarch_setting_t* setting_data_get_list(unsigned mask);
rarch_setting_t* setting_data_new(unsigned mask);
#ifdef __cplusplus
}