Start using menu_entries_get_title

This commit is contained in:
twinaphex 2015-05-15 00:07:07 +02:00
parent 3426dbca7f
commit 47a9f2c405
6 changed files with 5 additions and 22 deletions

View File

@ -349,10 +349,7 @@ static void glui_frame(void)
gl_menu_frame_background(menu, settings, gl, glui->textures.bg.id, 0.75f, 0.75f, false);
menu_list_get_last_stack(menu->menu_list, &dir, &label, &menu_type);
get_title(label, dir, menu_type, title, sizeof(title));
menu_entries_get_title(title, sizeof(title));
font_driver = driver->font_osd_driver;

View File

@ -398,14 +398,11 @@ static void rgui_render(void)
rgui_render_background();
menu_list_get_last_stack(menu->menu_list,
&dir, &label, &menu_type);
#if 0
RARCH_LOG("Dir is: %s\n", label);
#endif
get_title(label, dir, menu_type, title, sizeof(title));
menu_entries_get_title(title, sizeof(title));
menu_animation_ticker_line(title_buf, RGUI_TERM_WIDTH - 10,
frame_count / RGUI_TERM_START_X, title, true);

View File

@ -167,9 +167,7 @@ static void rmenu_render(void)
rmenu_render_background();
menu_list_get_last_stack(menu->menu_list, &dir, &label, &menu_type);
get_title(label, dir, menu_type, title, sizeof(title));
menu_entries_get_title(title, sizeof(title));
menu_animation_ticker_line(title_buf, RMENU_TERM_WIDTH,
frame_count / 15, title, true);

View File

@ -548,11 +548,9 @@ static void rmenu_xui_render(void)
rmenu_xui_render_background();
menu_list_get_last_stack(menu->menu_list, &dir, &label, &menu_type);
if (XuiHandleIsValid(m_menutitle))
{
get_title(label, dir, menu_type, title, sizeof(title));
menu_entries_get_title(title, sizeof(title));
mbstowcs(strw_buffer, title, sizeof(strw_buffer) / sizeof(wchar_t));
XuiTextElementSetText(m_menutitle, strw_buffer);
menu_animation_ticker_line(title, RXUI_TERM_WIDTH - 3, (unsigned int)frame_count / 15, title, true);

View File

@ -722,13 +722,7 @@ static void xmb_set_title(xmb_handle_t *xmb)
if (menu->categories.selection_ptr == 0)
{
const char *dir = NULL;
const char *label = NULL;
unsigned menu_type = 0;
menu_list_get_last_stack(menu->menu_list, &dir, &label, &menu_type);
get_title(label, dir, menu_type,
xmb->title_name, sizeof(xmb->title_name));
menu_entries_get_title(xmb->title_name, sizeof(xmb->title_name));
}
else
{

View File

@ -64,7 +64,6 @@ void menu_entries_get_title(char *title, size_t title_len)
menu_list_get_last_stack(menu->menu_list, &dir, &label, &menu_type);
get_title(label, dir, menu_type, title, title_len);
return;
}
// Returns true if a Back button should be shown (i.e. we are at least