Use menu_list_get_entry directly
This commit is contained in:
parent
b40b01b162
commit
f171be5fb6
|
@ -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];
|
entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH];
|
||||||
bool selected = false;
|
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);
|
selected = (i == menu->navigation.selection_ptr);
|
||||||
|
|
||||||
|
|
|
@ -493,7 +493,7 @@ static void rgui_render(void)
|
||||||
entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH];
|
entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH];
|
||||||
bool selected = false;
|
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);
|
selected = (i == menu->navigation.selection_ptr);
|
||||||
|
|
||||||
|
|
|
@ -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)
|
icon_y > global->video_data.height + xmb->icon.size)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
menu_display_setting_label(&entry, i, label, list);
|
menu_list_get_entry(&entry, i, label, list);
|
||||||
|
|
||||||
if (entry.type == MENU_FILE_CONTENTLIST_ENTRY)
|
if (entry.type == MENU_FILE_CONTENTLIST_ENTRY)
|
||||||
strlcpy(entry.path, path_basename(entry.path), sizeof(entry.path));
|
strlcpy(entry.path, path_basename(entry.path), sizeof(entry.path));
|
||||||
|
|
|
@ -207,22 +207,3 @@ void menu_display_unset_viewport(menu_handle_t *menu)
|
||||||
video_driver_set_viewport(global->video_data.width,
|
video_driver_set_viewport(global->video_data.width,
|
||||||
global->video_data.height, false, true);
|
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;
|
|
||||||
}
|
|
||||||
|
|
|
@ -54,12 +54,6 @@ void menu_display_set_viewport(menu_handle_t *menu);
|
||||||
|
|
||||||
void menu_display_unset_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
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue