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

menu_entries_append_enum - get rid of menu_driver_ident call

Browse Source
This commit is contained in:
twinaphex 2021-03-07 19:04:24 +01:00
parent e7702ae20f
commit 0cce2fb4e2
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
retroarch.c
View File

@ -3047,7 +3047,6 @@ bool menu_entries_append_enum(
size_t idx; size_t idx;
const char *menu_path = NULL; const char *menu_path = NULL;
menu_file_list_cbs_t *cbs = NULL; menu_file_list_cbs_t *cbs = NULL;
const char *menu_ident = menu_driver_ident();
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;
if (!list || !label) if (!list || !label)
@ -3122,9 +3121,8 @@ bool menu_entries_append_enum(
&& enum_idx != MENU_ENUM_LABEL_RDB_ENTRY) && enum_idx != MENU_ENUM_LABEL_RDB_ENTRY)
cbs->setting = menu_setting_find_enum(enum_idx); cbs->setting = menu_setting_find_enum(enum_idx);
if (!string_is_equal(menu_ident, "null") && list) menu_cbs_init(p_rarch->menu_driver_ctx,
menu_cbs_init(p_rarch->menu_driver_ctx, list, cbs, path, label, type, idx);
list, cbs, path, label, type, idx);
return true; return true;
} }
@ -3205,9 +3203,8 @@ void menu_entries_prepend(file_list_t *list,
file_list_set_actiondata(list, idx, cbs); file_list_set_actiondata(list, idx, cbs);
if (list) menu_cbs_init(p_rarch->menu_driver_ctx,
menu_cbs_init(p_rarch->menu_driver_ctx, list, cbs, path, label, type, idx);
list, cbs, path, label, type, idx);
} }
void menu_entries_get_last_stack(const char **path, const char **label, void menu_entries_get_last_stack(const char **path, const char **label,

4
retroarch_data.h
View File

@ -2774,6 +2774,8 @@ static void *null_menu_init(void **userdata, bool video_is_threaded)
return NULL; return NULL;
return menu; return menu;
} }
static int null_menu_list_bind_init(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx) { return 0; }
static menu_ctx_driver_t menu_ctx_null = { static menu_ctx_driver_t menu_ctx_null = {
NULL, /* set_texture */ NULL, /* set_texture */
@ -2805,7 +2807,7 @@ static menu_ctx_driver_t menu_ctx_null = {
NULL, /* list_get_size */ NULL, /* list_get_size */
NULL, /* list_get_entry */ NULL, /* list_get_entry */
NULL, /* list_set_selection */ NULL, /* list_set_selection */
NULL, /* bind_init */ null_menu_list_bind_init,
NULL, /* load_image */ NULL, /* load_image */
"null", "null",
NULL, /* environ */ NULL, /* environ */