mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-25 16:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove menu_entries_get_last

Browse Source
This commit is contained in:
twinaphex 2017-10-01 17:20:01 +02:00
parent e66ef15580
commit df15a67c71
4 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
menu/cbs/menu_cbs_ok.c
View File

@ -1382,7 +1382,7 @@ static int action_ok_file_load(const char *path,
menu_path_new[0] = full_path_new[0] = '\0'; menu_path_new[0] = full_path_new[0] = '\0';
menu_entries_get_last(menu_stack, &menu_path, &menu_label, NULL, NULL); file_list_get_last(menu_stack, &menu_path, &menu_label, NULL, NULL);
if (menu_label && !string_is_empty(menu_label)) if (menu_label && !string_is_empty(menu_label))
setting = menu_setting_find(menu_label); setting = menu_setting_find(menu_label);
@ -2415,7 +2415,7 @@ static int action_ok_file_load_ffmpeg(const char *path,
const char *menu_path = NULL; const char *menu_path = NULL;
file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0);
menu_entries_get_last(menu_stack, &menu_path, NULL, NULL, NULL); file_list_get_last(menu_stack, &menu_path, NULL, NULL, NULL);
new_path[0] = '\0'; new_path[0] = '\0';
@ -2476,7 +2476,8 @@ static int action_ok_file_load_imageviewer(const char *path,
content_ctx_info_t content_info; content_ctx_info_t content_info;
const char *menu_path = NULL; const char *menu_path = NULL;
file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0);
menu_entries_get_last(menu_stack, &menu_path, NULL, NULL, NULL);
file_list_get_last(menu_stack, &menu_path, NULL, NULL, NULL);
fullpath[0] = '\0'; fullpath[0] = '\0';

10
menu/menu_entries.c
View File

@ -44,14 +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);
} }
void menu_entries_get_last(const file_list_t *list,
const char **path, const char **label,
unsigned *file_type, size_t *entry_idx)
{
if (list)
file_list_get_last(list, path, label, file_type, entry_idx);
}
menu_file_list_cbs_t *menu_entries_get_actiondata_at_offset( menu_file_list_cbs_t *menu_entries_get_actiondata_at_offset(
const file_list_t *list, size_t idx) const file_list_t *list, size_t idx)
{ {
@ -477,7 +469,7 @@ void menu_entries_get_last_stack(const char **path, const char **label,
if (!menu_list) if (!menu_list)
return; return;
menu_entries_get_last(menu_list_get(menu_list, 0), file_list_get_last(menu_list_get(menu_list, 0),
path, label, file_type, entry_idx); path, label, file_type, entry_idx);
cbs = menu_entries_get_last_stack_actiondata(); cbs = menu_entries_get_last_stack_actiondata();
if (cbs && enum_idx) if (cbs && enum_idx)

4
menu/menu_entries.h
View File

@ -148,10 +148,6 @@ void menu_entries_get_at_offset(const file_list_t *list, size_t idx,
menu_file_list_cbs_t *menu_entries_get_actiondata_at_offset( menu_file_list_cbs_t *menu_entries_get_actiondata_at_offset(
const file_list_t *list, size_t idx); const file_list_t *list, size_t idx);
void menu_entries_get_last(const file_list_t *list,
const char **path, const char **label,
unsigned *file_type, size_t *entry_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);

4
menu/widgets/menu_list.c
View File

@ -154,7 +154,7 @@ void menu_list_flush_stack(menu_list_t *list,
return; return;
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh); menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
menu_entries_get_last(menu_list, file_list_get_last(menu_list,
&path, &label, &type, &entry_idx); &path, &label, &type, &entry_idx);
while (menu_list_flush_stack_type( while (menu_list_flush_stack_type(
@ -169,7 +169,7 @@ void menu_list_flush_stack(menu_list_t *list,
menu_list = menu_list_get(list, (unsigned)idx); menu_list = menu_list_get(list, (unsigned)idx);
menu_entries_get_last(menu_list, file_list_get_last(menu_list,
&path, &label, &type, &entry_idx); &path, &label, &type, &entry_idx);
} }
} }