mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-07 03:40:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Code duplication cleanup - use get_core_title

Browse Source
This commit is contained in:
twinaphex 2015-05-10 12:10:06 +02:00
parent 7914946d19
commit 53866fe029
5 changed files with 5 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
menu/drivers/glui.c
View File

@ -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,

17
menu/drivers/rgui.c
View File

@ -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) +

17
menu/drivers/rmenu.c
View File

@ -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);

17
menu/drivers/rmenu_xui.cpp
View File

@ -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);

19
menu/drivers/xmb.c
View File

@ -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);
}