Make menu_driver_load_image a static function

This commit is contained in:
twinaphex 2018-03-29 16:27:19 +02:00
parent a8b810760b
commit 77f7e1da8c
2 changed files with 14 additions and 16 deletions

View File

@ -61,6 +61,12 @@
#define PARTICLES_COUNT 100
typedef struct menu_ctx_load_image
{
void *data;
enum menu_image_type type;
} menu_ctx_load_image_t;
/* Menu drivers */
static const menu_ctx_driver_t *menu_ctx_drivers[] = {
#if defined(HAVE_XUI)
@ -1058,6 +1064,14 @@ bool menu_display_get_tex_coords(menu_display_ctx_coord_draw_t *draw)
return true;
}
static bool menu_driver_load_image(menu_ctx_load_image_t *load_image_info)
{
if (menu_driver_ctx && menu_driver_ctx->load_image)
return menu_driver_ctx->load_image(menu_userdata,
load_image_info->data, load_image_info->type);
return false;
}
void menu_display_handle_thumbnail_upload(void *task_data,
void *user_data, const char *err)
{
@ -1804,14 +1818,6 @@ void menu_driver_populate_entries(menu_displaylist_info_t *info)
info->label, info->type);
}
bool menu_driver_load_image(menu_ctx_load_image_t *load_image_info)
{
if (menu_driver_ctx && menu_driver_ctx->load_image)
return menu_driver_ctx->load_image(menu_userdata,
load_image_info->data, load_image_info->type);
return false;
}
bool menu_driver_push_list(menu_ctx_displaylist_t *disp_list)
{
if (menu_driver_ctx->list_push)

View File

@ -507,12 +507,6 @@ typedef struct menu_ctx_driver
menu_entry_t *entry, unsigned action);
} menu_ctx_driver_t;
typedef struct menu_ctx_load_image
{
void *data;
enum menu_image_type type;
} menu_ctx_load_image_t;
typedef struct menu_ctx_displaylist
{
menu_displaylist_info_t *info;
@ -630,8 +624,6 @@ void menu_driver_navigation_set(bool scroll);
void menu_driver_populate_entries(menu_displaylist_info_t *info);
bool menu_driver_load_image(menu_ctx_load_image_t *load_image_info);
bool menu_driver_push_list(menu_ctx_displaylist_t *disp_list);
bool menu_driver_init(bool video_is_threaded);