libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-07 14:23:29 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Create more wrapper functions

Browse Source
This commit is contained in:
twinaphex 2015-03-22 18:48:24 +01:00
parent 71dcc021a7
commit 6e91eed664
7 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gfx/video_driver.c
View File

@ -655,3 +655,32 @@ void video_driver_set_aspect_ratio(unsigned aspectratio_index)
driver->video_poke->set_aspect_ratio(driver->video_data,
aspectratio_index);
}
void video_driver_show_mouse(bool state)
{
driver_t *driver = driver_get_ptr();
if (!driver->video_data)
return;
if (!driver->video_poke)
return;
if (!driver->video_poke->show_mouse)
return;
driver->video_poke->show_mouse(
driver->video_data, state);
}
void video_driver_set_osd_msg(const char *msg,
const struct font_params *params, void *font)
{
driver_t *driver = driver_get_ptr();
if (!driver->video_data)
return;
if (!driver->video_poke)
return;
if (!driver->video_poke->set_osd_msg)
return;
driver->video_poke->set_osd_msg(driver->video_data,
msg, params, font);
}

5
gfx/video_driver.h
View File

@ -286,6 +286,11 @@ bool video_driver_get_video_output_size(
void video_driver_set_aspect_ratio(unsigned aspectratio_index);
void video_driver_show_mouse(bool state);
void video_driver_set_osd_msg(const char *msg,
const struct font_params *params, void *font);
#ifdef __cplusplus
}
#endif

11
menu/drivers/glui.c
View File

@ -71,7 +71,6 @@ static int glui_entry_iterate(unsigned action)
static void glui_blit_line(gl_t *gl, float x, float y, const char *message, uint32_t color)
{
struct font_params params = {0};
driver_t *driver = driver_get_ptr();
gl_set_viewport(gl, gl->win_width, gl->win_height, false, false);
@ -81,15 +80,7 @@ static void glui_blit_line(gl_t *gl, float x, float y, const char *message, uint
params.color = color;
params.full_screen = true;
if (!driver->video_data)
return;
if (!driver->video_poke)
return;
if (!driver->video_poke->set_osd_msg)
return;
driver->video_poke->set_osd_msg(driver->video_data,
message, &params, NULL);
video_driver_set_osd_msg(message, &params, NULL);
}
static void glui_render_background(settings_t *settings,

27
menu/drivers/rmenu.c
View File

@ -94,7 +94,6 @@ static void rmenu_render_messagebox(const char *message)
size_t i, j;
struct string_list *list = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
return;
@ -131,10 +130,7 @@ static void rmenu_render_messagebox(const char *message)
font_parms.scale = FONT_SIZE_NORMAL;
font_parms.color = WHITE;
if (driver->video_data && driver->video_poke
&& driver->video_poke->set_osd_msg)
driver->video_poke->set_osd_msg(driver->video_data,
msg, &font_parms, NULL);
video_driver_set_osd_msg(msg, &font_parms, NULL);
}
render_normal = false;
@ -155,7 +151,6 @@ static void rmenu_render(void)
unsigned menu_type = 0;
menu_handle_t *menu = menu_driver_get_ptr();
global_t *global = global_get_ptr();
driver_t *driver = driver_get_ptr();
runloop_t *runloop = rarch_main_get_ptr();
if (!menu)
@ -206,10 +201,7 @@ static void rmenu_render(void)
font_parms.scale = FONT_SIZE_NORMAL;
font_parms.color = WHITE;
if (driver->video_data && driver->video_poke
&& driver->video_poke->set_osd_msg)
driver->video_poke->set_osd_msg(driver->video_data,
title_buf, &font_parms, NULL);
video_driver_set_osd_msg(title_buf, &font_parms, NULL);
core_name = global->menu.info.library_name;
if (!core_name)
@ -231,10 +223,7 @@ static void rmenu_render(void)
snprintf(title_msg, sizeof(title_msg), "%s - %s %s",
PACKAGE_VERSION, core_name, core_version);
if (driver->video_data && driver->video_poke
&& driver->video_poke->set_osd_msg)
driver->video_poke->set_osd_msg(driver->video_data,
title_msg, &font_parms, NULL);
video_driver_set_osd_msg(title_msg, &font_parms, NULL);
j = 0;
@ -281,17 +270,11 @@ static void rmenu_render(void)
font_parms.scale = FONT_SIZE_NORMAL;
font_parms.color = WHITE;
if (driver->video_data && driver->video_poke
&& driver->video_poke->set_osd_msg)
driver->video_poke->set_osd_msg(driver->video_data,
message, &font_parms, NULL);
video_driver_set_osd_msg(message, &font_parms, NULL);
font_parms.x = POSITION_EDGE_CENTER + POSITION_OFFSET;
if (driver->video_data && driver->video_poke
&& driver->video_poke->set_osd_msg)
driver->video_poke->set_osd_msg(driver->video_data,
type_str_buf, &font_parms, NULL);
video_driver_set_osd_msg(type_str_buf, &font_parms, NULL);
}
}

4
menu/drivers/rmenu_xui.cpp
View File

@ -406,9 +406,7 @@ static void xui_render_message(const char *msg)
font_parms.y = msg_height + (msg_offset * j);
font_parms.scale = 21;
if (driver->video_poke && driver->video_poke->set_osd_msg)
driver->video_poke->set_osd_msg(driver->video_data,
msg, &font_parms, NULL);
video_driver_set_osd_msg(msg, &font_parms, NULL);
}
end:

6
menu/drivers/xmb.c
View File

@ -384,7 +384,6 @@ static void xmb_draw_text(gl_t *gl, xmb_handle_t *xmb, const char *str, float x,
{
uint8_t a8 = 0;
struct font_params params = {0};
driver_t *driver = driver_get_ptr();
if (alpha > xmb->alpha)
alpha = xmb->alpha;
@ -408,10 +407,7 @@ static void xmb_draw_text(gl_t *gl, xmb_handle_t *xmb, const char *str, float x,
params.full_screen = true;
params.align_right = align_right;
if (driver->video_data && driver->video_poke
&& driver->video_poke->set_osd_msg)
driver->video_poke->set_osd_msg(driver->video_data,
str, &params, xmb->font.buf);
video_driver_set_osd_msg(str, &params, xmb->font.buf);
}
static void xmb_frame_background(settings_t *settings,

4
retroarch.c
View File

@ -2944,9 +2944,7 @@ bool rarch_main_command(unsigned cmd)
grab_mouse_state ? "yes" : "no");
driver->input->grab_mouse(driver->input_data, grab_mouse_state);
if (driver->video_poke && driver->video_poke->show_mouse)
driver->video_poke->show_mouse(
driver->video_data, !grab_mouse_state);
video_driver_show_mouse(!grab_mouse_state);
}
break;
case RARCH_CMD_PERFCNT_REPORT_FRONTEND_LOG: