From f171be5fb60af57dbe156c15767426354501ff7c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 7 May 2015 09:39:04 +0200 Subject: [PATCH] Use menu_list_get_entry directly --- menu/drivers/glui.c | 2 +- menu/drivers/rgui.c | 2 +- menu/drivers/xmb.c | 2 +- menu/menu_display.c | 19 ------------------- menu/menu_display.h | 6 ------ 5 files changed, 3 insertions(+), 28 deletions(-) diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index 5b96dee40c..97823691ea 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -305,7 +305,7 @@ static void glui_render_menu_list(runloop_t *runloop, entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; bool selected = false; - menu_display_setting_label(&entry, i, label, NULL); + menu_list_get_entry(&entry, i, label, NULL); selected = (i == menu->navigation.selection_ptr); diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 9bb443db63..295d641bd9 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -493,7 +493,7 @@ static void rgui_render(void) entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; bool selected = false; - menu_display_setting_label(&entry, i, label, NULL); + menu_list_get_entry(&entry, i, label, NULL); selected = (i == menu->navigation.selection_ptr); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 4b8370ce92..fb7dbbf9ea 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1020,7 +1020,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, icon_y > global->video_data.height + xmb->icon.size) continue; - menu_display_setting_label(&entry, i, label, list); + menu_list_get_entry(&entry, i, label, list); if (entry.type == MENU_FILE_CONTENTLIST_ENTRY) strlcpy(entry.path, path_basename(entry.path), sizeof(entry.path)); diff --git a/menu/menu_display.c b/menu/menu_display.c index 92b3ea993c..71bc73f333 100644 --- a/menu/menu_display.c +++ b/menu/menu_display.c @@ -207,22 +207,3 @@ void menu_display_unset_viewport(menu_handle_t *menu) video_driver_set_viewport(global->video_data.width, global->video_data.height, false, true); } - -bool menu_display_setting_label( - menu_entry_t *entry, - unsigned i, - const char *label, - void *userdata) -{ - if (!entry) - return false; - - menu_list_get_entry(entry, i, label, userdata); -#if 0 - RARCH_LOG("Entry label : %s\n", entry->label ? entry->label : "N/A"); - RARCH_LOG("Entry path : %s\n", entry->path); - RARCH_LOG("Entry value : %s\n", entry->value); -#endif - - return true; -} diff --git a/menu/menu_display.h b/menu/menu_display.h index adab5f9116..ea026310f0 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -54,12 +54,6 @@ void menu_display_set_viewport(menu_handle_t *menu); void menu_display_unset_viewport(menu_handle_t *menu); -bool menu_display_setting_label( - menu_entry_t *entry, - unsigned i, - const char *label, - void *userdata); - #ifdef __cplusplus } #endif