diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index 9edeab4073..9bb478ecaa 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -340,8 +340,6 @@ static void glui_frame(void) unsigned menu_type = 0; gl_t *gl = NULL; glui_handle_t *glui = NULL; - const char *core_name = NULL; - const char *core_version = NULL; const struct font_renderer *font_driver = NULL; driver_t *driver = driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr(); @@ -417,23 +415,9 @@ static void glui_frame(void) glui_draw_scrollbar(gl); - core_name = global->menu.info.library_name; - if (!core_name) - core_name = global->system.info.library_name; - if (!core_name) - core_name = "No Core"; - if (settings->menu.core_enable) { - core_version = global->menu.info.library_version; - if (!core_version) - core_version = global->system.info.library_version; - if (!core_version) - core_version = ""; - - snprintf(title_msg, sizeof(title_msg), - "%s - %s %s", PACKAGE_VERSION, - core_name, core_version); + get_core_title(title_msg, sizeof(title_msg)); glui_blit_line(glui->margin, global->video_data.height - glui->line_height, title_msg, diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index a5e2dc8c33..b608143990 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -360,8 +360,6 @@ static void rgui_render(void) uint16_t hover_color, normal_color; const char *dir = NULL; const char *label = NULL; - const char *core_name = NULL; - const char *core_version = NULL; menu_handle_t *menu = menu_driver_get_ptr(); runloop_t *runloop = rarch_main_get_ptr(); driver_t *driver = driver_get_ptr(); @@ -453,22 +451,9 @@ static void rgui_render(void) RGUI_TERM_START_X + (RGUI_TERM_WIDTH - strlen(title_buf)) * FONT_WIDTH_STRIDE / 2, RGUI_TERM_START_X, title_buf, TITLE_COLOR(settings)); - core_name = global->menu.info.library_name; - if (!core_name) - core_name = global->system.info.library_name; - if (!core_name) - core_name = "No Core"; - if (settings->menu.core_enable) { - core_version = global->menu.info.library_version; - if (!core_version) - core_version = global->system.info.library_version; - if (!core_version) - core_version = ""; - - snprintf(title_msg, sizeof(title_msg), "%s - %s %s", PACKAGE_VERSION, - core_name, core_version); + get_core_title(title_msg, sizeof(title_msg)); blit_line(menu, RGUI_TERM_START_X, (RGUI_TERM_HEIGHT * FONT_HEIGHT_STRIDE) + diff --git a/menu/drivers/rmenu.c b/menu/drivers/rmenu.c index 973947ca37..c9a9360cec 100644 --- a/menu/drivers/rmenu.c +++ b/menu/drivers/rmenu.c @@ -147,8 +147,6 @@ static void rmenu_render(void) char title_msg[64]; const char *dir = NULL; const char *label = NULL; - const char *core_name = NULL; - const char *core_version = NULL; unsigned menu_type = 0; menu_handle_t *menu = menu_driver_get_ptr(); global_t *global = global_get_ptr(); @@ -205,25 +203,12 @@ static void rmenu_render(void) video_driver_set_osd_msg(title_buf, &font_parms, NULL); - core_name = global->menu.info.library_name; - if (!core_name) - core_name = global->system.info.library_name; - if (!core_name) - core_name = "No Core"; - - core_version = global->menu.info.library_version; - if (!core_version) - core_version = global->system.info.library_version; - if (!core_version) - core_version = ""; - font_parms.x = POSITION_EDGE_MIN + POSITION_OFFSET; font_parms.y = POSITION_EDGE_MAX - (POSITION_OFFSET*2); font_parms.scale = FONT_SIZE_NORMAL; font_parms.color = WHITE; - snprintf(title_msg, sizeof(title_msg), "%s - %s %s", - PACKAGE_VERSION, core_name, core_version); + get_core_title(title_msg, sizeof(title_msg)); video_driver_set_osd_msg(title_msg, &font_parms, NULL); diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp index 57cc5f1b31..fba3f865fb 100644 --- a/menu/drivers/rmenu_xui.cpp +++ b/menu/drivers/rmenu_xui.cpp @@ -580,22 +580,7 @@ static void rmenu_xui_render(void) if (XuiHandleIsValid(m_menutitle)) { - const char *core_version = NULL; - global_t *global = global_get_ptr(); - const char *core_name = global->menu.info.library_name; - if (!core_name) - core_name = global->system.info.library_name; - if (!core_name) - core_name = "No Core"; - - core_version = global->menu.info.library_version; - if (!core_version) - core_version = global->system.info.library_version; - if (!core_version) - core_version = ""; - - snprintf(title, sizeof(title), "%s - %s %s", - PACKAGE_VERSION, core_name, core_version); + get_core_title(title, sizeof(title)); mbstowcs(strw_buffer, title, sizeof(strw_buffer) / sizeof(wchar_t)); XuiTextElementSetText(m_menutitlebottom, strw_buffer); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 48ebb42e1c..d560eb668f 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1197,8 +1197,6 @@ static void xmb_frame(void) char msg[PATH_MAX_LENGTH]; char title_msg[PATH_MAX_LENGTH], timedate[PATH_MAX_LENGTH]; bool render_background = false; - const char *core_name = NULL; - const char *core_version = NULL; xmb_handle_t *xmb = NULL; gl_t *gl = NULL; const struct font_renderer *font_driver = NULL; @@ -1240,22 +1238,7 @@ static void xmb_frame(void) if (settings->menu.core_enable) { - core_name = global->menu.info.library_name; - - if (!core_name) - core_name = global->system.info.library_name; - if (!core_name) - core_name = "No Core"; - - core_version = global->menu.info.library_version; - - if (!core_version) - core_version = global->system.info.library_version; - if (!core_version) - core_version = ""; - - snprintf(title_msg, sizeof(title_msg), "%s - %s %s", PACKAGE_VERSION, - core_name, core_version); + get_core_title(title_msg, sizeof(title_msg)); xmb_draw_text(menu, xmb, title_msg, xmb->margins.title.left, global->video_data.height - xmb->margins.title.bottom, 1, 1, TEXT_ALIGN_LEFT); }