This commit is contained in:
twinaphex 2015-05-07 04:37:46 +02:00
parent ce9d025207
commit a13442625b
5 changed files with 8 additions and 12 deletions

View File

@ -304,9 +304,8 @@ static void glui_render_menu_list(runloop_t *runloop,
char message[PATH_MAX_LENGTH],
entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH];
bool selected = false;
menu_file_list_cbs_t *cbs = NULL;
menu_display_setting_label(cbs, &entry, i, label, NULL);
menu_display_setting_label(&entry, i, label, NULL);
selected = (i == menu->navigation.selection_ptr);

View File

@ -492,9 +492,8 @@ static void rgui_render(void)
char message[PATH_MAX_LENGTH],
entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH];
bool selected = false;
menu_file_list_cbs_t *cbs = NULL;
menu_display_setting_label(cbs, &entry, i, label, NULL);
menu_display_setting_label(&entry, i, label, NULL);
selected = (i == menu->navigation.selection_ptr);

View File

@ -1005,7 +1005,6 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
xmb_node_t *node = (xmb_node_t*)file_list_get_userdata_at_offset(list, i);
runloop_t *runloop = rarch_main_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
menu_file_list_cbs_t *cbs = NULL;
if (!node)
continue;
@ -1021,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(cbs, &entry, i, label, list);
menu_display_setting_label(&entry, i, label, list);
if (entry.type == MENU_FILE_CONTENTLIST_ENTRY)
strlcpy(entry.path, path_basename(entry.path), sizeof(entry.path));

View File

@ -209,16 +209,16 @@ void menu_display_unset_viewport(menu_handle_t *menu)
}
bool menu_display_setting_label(
menu_file_list_cbs_t *cbs,
menu_entry_t *entry,
unsigned i,
const char *label,
void *userdata)
{
const char *entry_label = NULL;
const char *path = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
file_list_t *list = userdata ? (file_list_t*)userdata
menu_file_list_cbs_t *cbs = NULL;
const char *entry_label = NULL;
const char *path = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
file_list_t *list = userdata ? (file_list_t*)userdata
: menu->menu_list->selection_buf;
if (!entry)

View File

@ -55,7 +55,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_file_list_cbs_t *cbs,
menu_entry_t *entry,
unsigned i,
const char *label,