Remove unused void * parameter for init_main_font

This commit is contained in:
twinaphex 2015-12-10 15:19:41 +01:00
parent d2c5139ab1
commit fbdfad6250
5 changed files with 6 additions and 8 deletions

View File

@ -907,7 +907,7 @@ static void mui_font(menu_handle_t *menu)
fill_pathname_join(mediapath, settings->assets_directory, "glui", sizeof(mediapath));
fill_pathname_join(fontpath, mediapath, "Roboto-Regular.ttf", sizeof(fontpath));
if (!menu_display_init_main_font(menu, fontpath, font_size))
if (!menu_display_init_main_font(fontpath, font_size))
RARCH_WARN("Failed to load font.");
}

View File

@ -1836,7 +1836,7 @@ static void xmb_font(menu_handle_t *menu)
fill_pathname_join(themepath, mediapath, XMB_THEME, sizeof(themepath));
fill_pathname_join(fontpath, themepath, "font.ttf", sizeof(fontpath));
if (!menu_display_init_main_font(menu, fontpath, font_size))
if (!menu_display_init_main_font(fontpath, font_size))
RARCH_WARN("Failed to load font.");
}

View File

@ -215,7 +215,7 @@ static void zarch_zui_font(menu_handle_t *menu)
fill_pathname_join(mediapath, settings->assets_directory, "zarch", sizeof(mediapath));
fill_pathname_join(fontpath, mediapath, "Roboto-Condensed.ttf", sizeof(fontpath));
if (!menu_display_init_main_font(menu, fontpath, font_size))
if (!menu_display_init_main_font(fontpath, font_size))
RARCH_WARN("Failed to load font.");
}
@ -1190,7 +1190,7 @@ static void zarch_context_reset(void)
zui = (zui_t*)menu->userdata;
font_path = settings->video.font_enable ? settings->video.font_path : NULL;
if (!menu_display_init_main_font(menu, font_path, zui->font_size))
if (!menu_display_init_main_font(font_path, zui->font_size))
RARCH_WARN("Failed to load font.");
zarch_context_bg_destroy(zui);

View File

@ -228,8 +228,7 @@ bool menu_display_driver_init_first(void)
return false;
}
bool menu_display_init_main_font(void *data,
const char *font_path, float font_size)
bool menu_display_init_main_font(const char *font_path, float font_size)
{
bool ret;
void *video = video_driver_get_ptr(false);

View File

@ -127,8 +127,7 @@ bool menu_display_font_bind_block(void *userdata);
bool menu_display_font_flush_block(void);
bool menu_display_init_main_font(void *data,
const char *font_path, float font_size);
bool menu_display_init_main_font(const char *font_path, float font_size);
void menu_display_free_main_font(void);