mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-23 10:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove menu_entries_get_actiondata_at_offset

Browse Source
This commit is contained in:
twinaphex 2017-10-01 17:25:41 +02:00
parent df15a67c71
commit 2b55e5858e
9 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/cbs/menu_cbs_left.c
View File

@ -209,9 +209,9 @@ static int action_left_mainmenu(unsigned type, const char *label,
file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0);
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
size_t selection = menu_navigation_get_selection(); size_t selection = menu_navigation_get_selection();
menu_file_list_cbs_t *cbs = menu_file_list_cbs_t *cbs = selection_buf ?
menu_entries_get_actiondata_at_offset(selection_buf, file_list_get_actiondata_at_offset(selection_buf,
selection); selection) : NULL;
list_info.type = MENU_LIST_HORIZONTAL; list_info.type = MENU_LIST_HORIZONTAL;
list_info.action = MENU_ACTION_LEFT; list_info.action = MENU_ACTION_LEFT;

2
menu/cbs/menu_cbs_right.c
View File

@ -191,7 +191,7 @@ static int action_right_goto_tab(void)
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0);
size_t selection = menu_navigation_get_selection(); size_t selection = menu_navigation_get_selection();
menu_file_list_cbs_t *cbs = menu_entries_get_actiondata_at_offset(selection_buf, selection); menu_file_list_cbs_t *cbs = selection_buf ? file_list_get_actiondata_at_offset(selection_buf, selection) : NULL;
list_info.type = MENU_LIST_HORIZONTAL; list_info.type = MENU_LIST_HORIZONTAL;
list_info.action = MENU_ACTION_RIGHT; list_info.action = MENU_ACTION_RIGHT;

2
menu/cbs/menu_cbs_select.c
View File

@ -42,7 +42,7 @@ static int action_select_default(const char *path, const char *label, unsigned t
menu_entry_init(&entry); menu_entry_init(&entry);
menu_entry_get(&entry, 0, idx, NULL, false); menu_entry_get(&entry, 0, idx, NULL, false);
cbs = menu_entries_get_actiondata_at_offset(selection_buf, idx); cbs = selection_buf ? file_list_get_actiondata_at_offset(selection_buf, idx) : NULL;
if (!cbs) if (!cbs)
{ {

5
menu/drivers/menu_generic.c
View File

@ -133,8 +133,9 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
case ITERATE_TYPE_INFO: case ITERATE_TYPE_INFO:
{ {
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
menu_file_list_cbs_t *cbs = menu_file_list_cbs_t *cbs = selection_buf ?
menu_entries_get_actiondata_at_offset(selection_buf, selection); file_list_get_actiondata_at_offset(selection_buf, selection)
: NULL;
if (cbs->enum_idx != MSG_UNKNOWN) if (cbs->enum_idx != MSG_UNKNOWN)
{ {

13
menu/menu_entries.c
View File

@ -44,15 +44,6 @@ void menu_entries_get_at_offset(const file_list_t *list, size_t idx,
file_list_get_alt_at_offset(list, idx, alt); file_list_get_alt_at_offset(list, idx, alt);
} }
menu_file_list_cbs_t *menu_entries_get_actiondata_at_offset(
const file_list_t *list, size_t idx)
{
if (!list)
return NULL;
return (menu_file_list_cbs_t*)
file_list_get_actiondata_at_offset(list, idx);
}
static bool menu_entries_clear(file_list_t *list) static bool menu_entries_clear(file_list_t *list)
{ {
unsigned i; unsigned i;
@ -509,8 +500,8 @@ size_t menu_entries_get_size(void)
rarch_setting_t *menu_entries_get_setting(uint32_t i) rarch_setting_t *menu_entries_get_setting(uint32_t i)
{ {
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
menu_file_list_cbs_t *cbs = menu_file_list_cbs_t *cbs = selection_buf ?
menu_entries_get_actiondata_at_offset(selection_buf, i); file_list_get_actiondata_at_offset(selection_buf, i) : NULL;
if (!cbs) if (!cbs)
return NULL; return NULL;

3
menu/menu_entries.h
View File

@ -145,9 +145,6 @@ void menu_entries_get_at_offset(const file_list_t *list, size_t idx,
const char **path, const char **label, unsigned *file_type, const char **path, const char **label, unsigned *file_type,
size_t *entry_idx, const char **alt); size_t *entry_idx, const char **alt);
menu_file_list_cbs_t *menu_entries_get_actiondata_at_offset(
const file_list_t *list, size_t idx);
void menu_entries_set_alt_at_offset(file_list_t *list, size_t idx, void menu_entries_set_alt_at_offset(file_list_t *list, size_t idx,
const char *alt); const char *alt);

6
menu/menu_input.c
View File

@ -563,13 +563,11 @@ static int menu_input_pointer_post_iterate(
void menu_input_post_iterate(int *ret, unsigned action) void menu_input_post_iterate(int *ret, unsigned action)
{ {
menu_entry_t entry; menu_entry_t entry;
menu_file_list_cbs_t *cbs = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
size_t selection = menu_navigation_get_selection(); size_t selection = menu_navigation_get_selection();
menu_file_list_cbs_t *cbs = selection_buf ?
if (selection_buf) file_list_get_actiondata_at_offset(selection_buf, selection) : NULL;
cbs = menu_entries_get_actiondata_at_offset(selection_buf, selection);
menu_entry_init(&entry); menu_entry_init(&entry);
menu_entry_get(&entry, 0, selection, NULL, false); menu_entry_get(&entry, 0, selection, NULL, false);

4
menu/menu_setting.c
View File

@ -916,8 +916,8 @@ int menu_setting_set(unsigned type, const char *label,
int ret = 0; int ret = 0;
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
size_t selection = menu_navigation_get_selection(); size_t selection = menu_navigation_get_selection();
menu_file_list_cbs_t *cbs = menu_entries_get_actiondata_at_offset( menu_file_list_cbs_t *cbs = selection_buf ?
selection_buf, selection); file_list_get_actiondata_at_offset(selection_buf, selection) : NULL;
if (!cbs) if (!cbs)
return 0; return 0;

8
menu/widgets/menu_entry.c
View File

@ -313,7 +313,7 @@ void menu_entry_get(menu_entry_t *entry, size_t stack_idx,
menu_entries_get_at_offset(list, i, &path, &entry_label, &entry->type, menu_entries_get_at_offset(list, i, &path, &entry_label, &entry->type,
&entry->entry_idx, NULL); &entry->entry_idx, NULL);
cbs = menu_entries_get_actiondata_at_offset(list, i); cbs = list ? file_list_get_actiondata_at_offset(list, i) : NULL;
if (cbs) if (cbs)
{ {
@ -417,8 +417,8 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action)
int ret = 0; int ret = 0;
file_list_t *selection_buf = file_list_t *selection_buf =
menu_entries_get_selection_buf_ptr(0); menu_entries_get_selection_buf_ptr(0);
menu_file_list_cbs_t *cbs = menu_file_list_cbs_t *cbs = selection_buf ?
menu_entries_get_actiondata_at_offset(selection_buf, i); file_list_get_actiondata_at_offset(selection_buf, i) : NULL;
switch (action) switch (action)
{ {
@ -482,7 +482,7 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action)
break; break;
} }
cbs = menu_entries_get_actiondata_at_offset(selection_buf, i); cbs = selection_buf ? file_list_get_actiondata_at_offset(selection_buf, i) : NULL;
if (menu_entries_ctl(MENU_ENTRIES_CTL_NEEDS_REFRESH, NULL)) if (menu_entries_ctl(MENU_ENTRIES_CTL_NEEDS_REFRESH, NULL))
{ {