CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-18 17:04:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(menu_display) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-09-27 01:03:58 +02:00
parent c8519cd89c
commit 613347a612
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
menu/menu_display.c
View File

@ -15,12 +15,15 @@
#include <time.h>
#include <queues/message_queue.h>
#include "../config.def.h"
#include "../gfx/font_renderer_driver.h"
#include "../gfx/video_context_driver.h"
#include "../gfx/video_thread_wrapper.h"
#include "menu.h"
#include "menu_display.h"
#include "../gfx/video_context_driver.h"
#include "../gfx/video_thread_wrapper.h"
typedef struct menu_framebuf
{
@ -136,9 +139,10 @@ bool menu_display_font_init_first(const void **font_driver,
font_path, font_size, FONT_DRIVER_RENDER_OPENGL_API);
}
bool menu_display_font_bind_block(void *data,
const struct font_renderer *font_driver, void *userdata)
bool menu_display_font_bind_block(void *data, const void *font_data, void *userdata)
{
const struct font_renderer *font_driver =
(const struct font_renderer*)font_data;
menu_display_t *disp = menu_display_get_ptr();
if (!disp || !font_driver || !font_driver->bind_block)
return false;
@ -148,9 +152,10 @@ bool menu_display_font_bind_block(void *data,
return true;
}
bool menu_display_font_flush_block(void *data,
const struct font_renderer *font_driver)
bool menu_display_font_flush_block(void *data, const void *font_data)
{
const struct font_renderer *font_driver =
(const struct font_renderer*)font_data;
menu_handle_t *menu = (menu_handle_t*)data;
menu_display_t *disp = menu_display_get_ptr();
if (!font_driver || !font_driver->flush)

10
menu/menu_display.h
View File

@ -20,10 +20,6 @@
#include <stdlib.h>
#include <boolean.h>
#include <queues/message_queue.h>
#include "../gfx/font_renderer_driver.h"
#ifdef __cplusplus
extern "C" {
#endif
@ -68,11 +64,9 @@ bool menu_display_font_init_first(const void **font_driver,
void **font_handle, void *video_data, const char *font_path,
float font_size);
bool menu_display_font_bind_block(void *data,
const struct font_renderer *font_driver, void *userdata);
bool menu_display_font_bind_block(void *data, const void *font_data, void *userdata);
bool menu_display_font_flush_block(void *data,
const struct font_renderer *font_driver);
bool menu_display_font_flush_block(void *data, const void *font_data);
bool menu_display_init_main_font(void *data,
const char *font_path, float font_size);