ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2017-05-27 16:26:45 +02:00
parent 1acfb9fed6
commit 70ffe1c12e
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
menu/menu_driver.c
View File

@ -168,21 +168,16 @@ void menu_display_toggle_set_reason(enum menu_toggle_reason reason)
menu_display_toggle_reason = reason; menu_display_toggle_reason = reason;
} }
static const char *menu_video_get_ident(bool video_is_threaded)
{
#ifdef HAVE_THREADS
if (video_is_threaded)
return video_thread_get_ident();
#endif
return video_driver_get_ident();
}
static bool menu_display_check_compatibility( static bool menu_display_check_compatibility(
enum menu_display_driver_type type, enum menu_display_driver_type type,
bool video_is_threaded) bool video_is_threaded)
{ {
const char *video_driver = menu_video_get_ident(video_is_threaded); const char *video_driver =
#ifdef HAVE_THREADS
(video_is_threaded) ?
video_thread_get_ident() :
#endif
video_driver_get_ident();
switch (type) switch (type)
{ {
@ -265,16 +260,14 @@ void menu_display_timedate(menu_display_ctx_datetime_t *datetime)
void menu_display_blend_begin(void) void menu_display_blend_begin(void)
{ {
if (!menu_disp || !menu_disp->blend_begin) if (menu_disp && menu_disp->blend_begin)
return; menu_disp->blend_begin();
menu_disp->blend_begin();
} }
void menu_display_blend_end(void) void menu_display_blend_end(void)
{ {
if (!menu_disp || !menu_disp->blend_end) if (menu_disp && menu_disp->blend_end)
return; menu_disp->blend_end();
menu_disp->blend_end();
} }
void menu_display_font_free(font_data_t *font) void menu_display_font_free(font_data_t *font)
@ -282,7 +275,8 @@ void menu_display_font_free(font_data_t *font)
font_driver_free(font); font_driver_free(font);
} }
static font_data_t *menu_display_font_main_init(menu_display_ctx_font_t *font, static font_data_t *menu_display_font_main_init(
menu_display_ctx_font_t *font,
bool is_threaded) bool is_threaded)
{ {
font_data_t *font_data = NULL; font_data_t *font_data = NULL;