From 6e91eed664210f1cad0ef0473864614309c2284a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 22 Mar 2015 18:48:24 +0100 Subject: [PATCH] Create more wrapper functions --- gfx/video_driver.c | 29 +++++++++++++++++++++++++++++ gfx/video_driver.h | 5 +++++ menu/drivers/glui.c | 11 +---------- menu/drivers/rmenu.c | 27 +++++---------------------- menu/drivers/rmenu_xui.cpp | 4 +--- menu/drivers/xmb.c | 6 +----- retroarch.c | 4 +--- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 408a34b4ef..599f6df5f2 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -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); +} diff --git a/gfx/video_driver.h b/gfx/video_driver.h index 9b0d3ddbba..aa409ae9bc 100644 --- a/gfx/video_driver.h +++ b/gfx/video_driver.h @@ -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 diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index 2fc76a9e1c..ae2852f804 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -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, ¶ms, NULL); + video_driver_set_osd_msg(message, ¶ms, NULL); } static void glui_render_background(settings_t *settings, diff --git a/menu/drivers/rmenu.c b/menu/drivers/rmenu.c index cfb48aa161..ea2be65da7 100644 --- a/menu/drivers/rmenu.c +++ b/menu/drivers/rmenu.c @@ -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); } } diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp index b67b9bda38..afdb3d2a02 100644 --- a/menu/drivers/rmenu_xui.cpp +++ b/menu/drivers/rmenu_xui.cpp @@ -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: diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 6eb99921ea..d2ad33de4d 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -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, ¶ms, xmb->font.buf); + video_driver_set_osd_msg(str, ¶ms, xmb->font.buf); } static void xmb_frame_background(settings_t *settings, diff --git a/retroarch.c b/retroarch.c index ae2a0696f3..ab6c51df5f 100644 --- a/retroarch.c +++ b/retroarch.c @@ -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: