From 2d64c7aa8f4e9dbc8bafea6271403dfc6c91b36a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 14 Sep 2014 15:17:03 +0200 Subject: [PATCH] (Menu) Uniquely name png_texture_load in lakka and glui --- frontend/menu/disp/glui.c | 4 ++-- frontend/menu/disp/lakka.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/menu/disp/glui.c b/frontend/menu/disp/glui.c index a4b2939c98..972c410875 100644 --- a/frontend/menu/disp/glui.c +++ b/frontend/menu/disp/glui.c @@ -327,7 +327,7 @@ static int glui_input_postprocess(uint64_t old_state) return 0; } -static GLuint png_texture_load(const char * file_name) +static GLuint glui_png_texture_load(const char * file_name) { struct texture_image ti = {0}; texture_image_load(&ti, file_name); @@ -364,7 +364,7 @@ static void glui_context_reset(void *data) fill_pathname_join(bgpath, bgpath, "bg.png", sizeof(bgpath)); if (path_file_exists(bgpath)) - glui_bg = png_texture_load(bgpath); + glui_bg = glui_png_texture_load(bgpath); } menu_ctx_driver_t menu_ctx_glui = { diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c index 876e95683d..15480870ee 100644 --- a/frontend/menu/disp/lakka.c +++ b/frontend/menu/disp/lakka.c @@ -661,7 +661,7 @@ static void lakka_frame(void) gl_set_viewport(gl, gl->win_width, gl->win_height, false, false); } -static GLuint png_texture_load(const char * file_name) +static GLuint lakka_png_texture_load(const char * file_name) { struct texture_image ti = {0}; texture_image_load(&ti, file_name); @@ -883,7 +883,7 @@ static void lakka_context_reset(void *data) "reload.png", sizeof(textures[TEXTURE_RELOAD].path)); for (k = 0; k < TEXTURE_LAST; k++) - textures[k].id = png_texture_load(textures[k].path); + textures[k].id = lakka_png_texture_load(textures[k].path); lakka_settings_context_reset(); for (i = 1; i < num_categories; i++) @@ -926,8 +926,8 @@ static void lakka_context_reset(void *data) strlcat(content_texturepath, core_id, sizeof(content_texturepath)); strlcat(content_texturepath, "-content.png", sizeof(content_texturepath)); - category->icon = png_texture_load(texturepath); - category->item_icon = png_texture_load(content_texturepath); + category->icon = lakka_png_texture_load(texturepath); + category->item_icon = lakka_png_texture_load(content_texturepath); for (j = 0; j < category->num_items; j++) {