diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index 622086d869..27822b21e5 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -147,7 +147,7 @@ static int action_left_mainmenu(unsigned type, const char *label, menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection); - cbs = menu_list_get_actiondata_at_offset(selection_buf, + cbs = menu_entries_get_actiondata_at_offset(selection_buf, selection); switch (push_list) diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index 659e317c9c..7edc57831f 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -172,7 +172,7 @@ static int action_right_mainmenu(unsigned type, const char *label, menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection); - cbs = menu_list_get_actiondata_at_offset(selection_buf, selection); + cbs = menu_entries_get_actiondata_at_offset(selection_buf, selection); switch (push_list) { diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c index 7a178634e6..794d0756fd 100644 --- a/menu/cbs/menu_cbs_select.c +++ b/menu/cbs/menu_cbs_select.c @@ -37,7 +37,7 @@ static int action_select_default(const char *path, const char *label, unsigned t menu_entry_get(&entry, idx, NULL, false); - cbs = menu_list_get_actiondata_at_offset(selection_buf, idx); + cbs = menu_entries_get_actiondata_at_offset(selection_buf, idx); if (!cbs) return -1; diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c index d70e043ea0..449534889b 100644 --- a/menu/drivers/menu_generic.c +++ b/menu/drivers/menu_generic.c @@ -251,7 +251,7 @@ int generic_menu_iterate(enum menu_action action) break; case ITERATE_TYPE_INFO: { - menu_file_list_cbs_t *cbs = menu_list_get_actiondata_at_offset(selection_buf, selection); + menu_file_list_cbs_t *cbs = menu_entries_get_actiondata_at_offset(selection_buf, selection); rarch_setting_t *setting = cbs->setting; if (setting) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index b565979833..87d9168fc6 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -603,7 +603,7 @@ static void xmb_selection_pointer_changed(bool allow_animations) float iy, real_iy; float ia = xmb->item.passive.alpha; float iz = xmb->item.passive.zoom; - xmb_node_t *node = (xmb_node_t*)menu_list_get_userdata_at_offset(selection_buf, i); + xmb_node_t *node = (xmb_node_t*)menu_entries_get_userdata_at_offset(selection_buf, i); if (!node) continue; @@ -656,7 +656,7 @@ static void xmb_list_open_old(xmb_handle_t *xmb, { float ia = 0; float real_y; - xmb_node_t *node = (xmb_node_t*)menu_list_get_userdata_at_offset(list, i); + xmb_node_t *node = (xmb_node_t*)menu_entries_get_userdata_at_offset(list, i); if (!node) continue; @@ -701,7 +701,7 @@ static void xmb_list_open_new(xmb_handle_t *xmb, float ia; float real_y; xmb_node_t *node = (xmb_node_t*) - menu_list_get_userdata_at_offset(list, i); + menu_entries_get_userdata_at_offset(list, i); if (!node) continue; @@ -773,7 +773,7 @@ static xmb_node_t *xmb_node_allocate_userdata(xmb_handle_t *xmb, unsigned i) static xmb_node_t* xmb_get_userdata_from_horizontal_list( xmb_handle_t *xmb, unsigned i) { - return (xmb_node_t*)menu_list_get_actiondata_at_offset(xmb->horizontal_list, i); + return (xmb_node_t*)menu_entries_get_actiondata_at_offset(xmb->horizontal_list, i); } static void xmb_push_animations(xmb_node_t *node, float ia, float ix) @@ -795,7 +795,7 @@ static void xmb_list_switch_old(xmb_handle_t *xmb, for (i = 0; i < end; i++) { xmb_node_t *node = (xmb_node_t*) - menu_list_get_userdata_at_offset(list, i); + menu_entries_get_userdata_at_offset(list, i); float ia = 0; if (!node) @@ -836,7 +836,7 @@ static void xmb_list_switch_new(xmb_handle_t *xmb, for (i = 0; i < end; i++) { xmb_node_t *node = (xmb_node_t*) - menu_list_get_userdata_at_offset(list, i); + menu_entries_get_userdata_at_offset(list, i); float ia = 0.5; if (!node) @@ -1195,7 +1195,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, menu_entry_t entry = {{0}}; GRuint texture_switch = 0; GRuint icon = 0; - xmb_node_t * node = (xmb_node_t*)menu_list_get_userdata_at_offset(list, i); + xmb_node_t * node = (xmb_node_t*)menu_entries_get_userdata_at_offset(list, i); uint32_t hash_label = 0; uint32_t hash_value = 0; bool do_draw_text = false; @@ -1773,7 +1773,7 @@ static void xmb_layout(menu_handle_t *menu, xmb_handle_t *xmb) { float ia = xmb->item.passive.alpha; float iz = xmb->item.passive.zoom; - xmb_node_t *node = (xmb_node_t*)menu_list_get_userdata_at_offset( + xmb_node_t *node = (xmb_node_t*)menu_entries_get_userdata_at_offset( selection_buf, i); if (!node) diff --git a/menu/menu_entries.c b/menu/menu_entries.c index 5d12b475e7..6ae163116e 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -39,13 +39,6 @@ struct menu_entries rarch_setting_t *list_settings; }; -static size_t menu_list_get_size(menu_list_t *list) -{ - if (!list) - return 0; - return file_list_get_size(list->selection_buf); -} - static void menu_list_free_list(file_list_t *list) { unsigned i; @@ -114,14 +107,14 @@ void menu_entries_get_last(const file_list_t *list, file_list_get_last(list, path, label, file_type, entry_idx); } -void *menu_list_get_userdata_at_offset(const file_list_t *list, size_t idx) +void *menu_entries_get_userdata_at_offset(const file_list_t *list, size_t idx) { if (!list) return NULL; return (menu_file_list_cbs_t*)file_list_get_userdata_at_offset(list, idx); } -menu_file_list_cbs_t *menu_list_get_actiondata_at_offset( +menu_file_list_cbs_t *menu_entries_get_actiondata_at_offset( const file_list_t *list, size_t idx) { if (!list) @@ -306,15 +299,14 @@ static void menu_entries_build_scroll_indices(file_list_t *list) void menu_entries_refresh(file_list_t *list) { size_t list_size, selection; - menu_list_t *menu_list = menu_list_get_ptr(); - if (!menu_list || !list) + if (!list) return; if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) return; menu_entries_build_scroll_indices(list); - list_size = menu_list_get_size(menu_list); + list_size = menu_entries_get_size(); if ((selection >= list_size) && list_size) { @@ -398,7 +390,7 @@ void menu_entries_get(size_t i, menu_entry_t *entry) menu_entries_get_at_offset(selection_buf, i, &path, &entry_label, &entry->type, &entry->entry_idx, NULL); - cbs = menu_list_get_actiondata_at_offset(selection_buf, i); + cbs = menu_entries_get_actiondata_at_offset(selection_buf, i); if (cbs && cbs->action_get_value) cbs->action_get_value(selection_buf, @@ -641,13 +633,13 @@ size_t menu_entries_get_size(void) menu_list_t *menu_list = menu_list_get_ptr(); if (!menu_list) return 0; - return menu_list_get_size(menu_list); + return file_list_get_size(menu_list->selection_buf); } rarch_setting_t *menu_entries_get_setting(uint32_t i) { file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(); - menu_file_list_cbs_t *cbs = menu_list_get_actiondata_at_offset(selection_buf, i); + menu_file_list_cbs_t *cbs = menu_entries_get_actiondata_at_offset(selection_buf, i); if (!cbs) return NULL; diff --git a/menu/menu_entries.h b/menu/menu_entries.h index 8b03bfd786..cd871546f9 100644 --- a/menu/menu_entries.h +++ b/menu/menu_entries.h @@ -155,9 +155,9 @@ void menu_entries_get_at_offset(const file_list_t *list, size_t idx, menu_list_t *menu_list_get_ptr(void); -void *menu_list_get_userdata_at_offset(const file_list_t *list, size_t idx); +void *menu_entries_get_userdata_at_offset(const file_list_t *list, size_t idx); -menu_file_list_cbs_t *menu_list_get_actiondata_at_offset(const file_list_t *list, size_t idx); +menu_file_list_cbs_t *menu_entries_get_actiondata_at_offset(const file_list_t *list, size_t idx); void menu_entries_get_last(const file_list_t *list, const char **path, const char **label, @@ -165,7 +165,7 @@ void menu_entries_get_last(const file_list_t *list, void menu_entries_clear(file_list_t *list); -void menu_list_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); void menu_entries_refresh(file_list_t *list); diff --git a/menu/menu_entry.c b/menu/menu_entry.c index 2742dc6a5e..dbfd69d997 100644 --- a/menu/menu_entry.c +++ b/menu/menu_entry.c @@ -299,7 +299,7 @@ void menu_entry_get(menu_entry_t *entry, size_t i, menu_entries_get_at_offset(list, i, &path, &entry_label, &entry->type, &entry->entry_idx, NULL); - cbs = menu_list_get_actiondata_at_offset(list, i); + cbs = menu_entries_get_actiondata_at_offset(list, i); if (cbs && cbs->action_get_value && use_representation) { @@ -352,7 +352,7 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action) { int ret = 0; file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(); - menu_file_list_cbs_t *cbs = menu_list_get_actiondata_at_offset(selection_buf, i); + menu_file_list_cbs_t *cbs = menu_entries_get_actiondata_at_offset(selection_buf, i); switch (action) { @@ -412,7 +412,7 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action) break; } - cbs = menu_list_get_actiondata_at_offset(selection_buf, i); + cbs = menu_entries_get_actiondata_at_offset(selection_buf, i); if (menu_entries_needs_refresh()) { diff --git a/menu/menu_input.c b/menu/menu_input.c index c39fadc23e..b5ce87f13a 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -1185,7 +1185,7 @@ void menu_input_post_iterate(int *ret, unsigned action) return; if (selection_buf) - cbs = menu_list_get_actiondata_at_offset(selection_buf, selection); + cbs = menu_entries_get_actiondata_at_offset(selection_buf, selection); menu_entry_get(&entry, selection, NULL, false); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 08c891c391..e2290a5d28 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -516,7 +516,7 @@ int menu_setting_set(unsigned type, const char *label, if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) return 0; - cbs = menu_list_get_actiondata_at_offset(selection_buf, selection); + cbs = menu_entries_get_actiondata_at_offset(selection_buf, selection); if (!cbs) return 0;