From df813ad58bb727b3cd78c42c8bd44af3c94e68b7 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 5 Dec 2015 12:10:12 +0100 Subject: [PATCH] Create font_driver_flush --- gfx/font_driver.c | 10 ++++++++++ gfx/font_driver.h | 2 ++ menu/menu_display.c | 6 ++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gfx/font_driver.c b/gfx/font_driver.c index fba25ababa..8c5fbfc892 100644 --- a/gfx/font_driver.c +++ b/gfx/font_driver.c @@ -233,6 +233,15 @@ void font_driver_bind_block(void *font_data, void *block) font_ctx->bind_block(new_font_data, block); } +void font_driver_flush(void *data) +{ + driver_t *driver = driver_get_ptr(); + const font_renderer_t *font_ctx = driver->font_osd_driver; + + if (font_ctx->flush) + font_ctx->flush(data); +} + void font_driver_free(void *data) { driver_t *driver = driver_get_ptr(); @@ -287,3 +296,4 @@ bool font_driver_init_first(const void **font_driver, void *font_handle, return font_init_first(new_font_driver, new_font_handle, data, font_path, font_size, api); } + diff --git a/gfx/font_driver.h b/gfx/font_driver.h index 8f6c398dfc..d721612019 100644 --- a/gfx/font_driver.h +++ b/gfx/font_driver.h @@ -140,6 +140,8 @@ void font_driver_render_msg(void *data, const char *msg, const struct font_param void font_driver_bind_block(void *font_data, void *block); +void font_driver_flush(void *data); + void font_driver_free(void *data); bool font_driver_init_first(const void **font_driver, void *font_handle, diff --git a/menu/menu_display.c b/menu/menu_display.c index d1a910d724..57fac2c295 100644 --- a/menu/menu_display.c +++ b/menu/menu_display.c @@ -156,13 +156,11 @@ bool menu_display_font_bind_block(void *userdata) bool menu_display_font_flush_block(void) { - driver_t *driver = driver_get_ptr(); menu_display_t *disp = menu_display_get_ptr(); - const struct font_renderer *font_driver = driver->font_osd_driver; - if (!font_driver || !font_driver->flush || !disp || !disp->font.buf) + if (!disp || !disp->font.buf) return false; - font_driver->flush(disp->font.buf); + font_driver_flush(disp->font.buf); return menu_display_font_bind_block(NULL); }