diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index 1331e734e8..6e639258f6 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -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; diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index ad837481cc..35027cc2f4 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -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); diff --git a/menu/drivers/rmenu.c b/menu/drivers/rmenu.c index bb56fdb19c..11b2c00210 100644 --- a/menu/drivers/rmenu.c +++ b/menu/drivers/rmenu.c @@ -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); diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp index 8bb8aec04a..923b28b6db 100644 --- a/menu/drivers/rmenu_xui.cpp +++ b/menu/drivers/rmenu_xui.cpp @@ -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); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 84329133dc..7affae5f57 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -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 { diff --git a/menu/menu_entry.c b/menu/menu_entry.c index 6d7f288a7b..454b9f7556 100644 --- a/menu/menu_entry.c +++ b/menu/menu_entry.c @@ -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