mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove input_overlay_load_overlay_image

Browse Source
This commit is contained in:
twinaphex 2015-02-27 06:53:10 +01:00
parent 622321f3fc
commit f30e82bced
1 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
input/input_overlay.c
View File

@ -331,34 +331,6 @@ end:
return ret; return ret;
} }
static bool input_overlay_load_overlay_image(input_overlay_t *ol,
const char *config_path,
struct overlay *overlay, unsigned idx)
{
if (overlay->config.paths.path[0] != '\0')
{
char overlay_resolved_path[PATH_MAX_LENGTH];
struct texture_image img = {0};
fill_pathname_resolve_relative(overlay_resolved_path, config_path,
overlay->config.paths.path, sizeof(overlay_resolved_path));
if (!texture_image_load(&img, overlay_resolved_path))
{
RARCH_ERR("[Overlay]: Failed to load image: %s.\n",
overlay_resolved_path);
ol->loading_status = OVERLAY_IMAGE_TRANSFER_ERROR;
return false;
}
overlay->image = img;
return true;
}
return false;
}
static bool input_overlay_load_overlay(input_overlay_t *ol, static bool input_overlay_load_overlay(input_overlay_t *ol,
const char *config_path, const char *config_path,
struct overlay *overlay, unsigned idx) struct overlay *overlay, unsigned idx)
@ -539,10 +511,7 @@ bool input_overlay_load_overlays_iterate(input_overlay_t *ol)
switch (ol->loading_status) switch (ol->loading_status)
{ {
case OVERLAY_IMAGE_TRANSFER_NONE: case OVERLAY_IMAGE_TRANSFER_NONE:
if (!input_overlay_load_overlay_image(ol, ol->loading_status = OVERLAY_IMAGE_TRANSFER_DONE;
ol->overlay_path, &ol->overlays[ol->pos], ol->pos))
ol->loading_status = OVERLAY_IMAGE_TRANSFER_DONE;
ol->loading_status = OVERLAY_IMAGE_TRANSFER_BUSY;
break; break;
case OVERLAY_IMAGE_TRANSFER_BUSY: case OVERLAY_IMAGE_TRANSFER_BUSY:
ol->loading_status = OVERLAY_IMAGE_TRANSFER_DONE; ol->loading_status = OVERLAY_IMAGE_TRANSFER_DONE;
@ -675,6 +644,25 @@ bool input_overlay_load_overlays(input_overlay_t *ol)
config_get_path(conf, overlay->config.paths.key, config_get_path(conf, overlay->config.paths.key,
overlay->config.paths.path, sizeof(overlay->config.paths.path)); overlay->config.paths.path, sizeof(overlay->config.paths.path));
if (overlay->config.paths.path[0] != '\0')
{
char overlay_resolved_path[PATH_MAX_LENGTH];
struct texture_image img = {0};
fill_pathname_resolve_relative(overlay_resolved_path, ol->overlay_path,
overlay->config.paths.path, sizeof(overlay_resolved_path));
if (!texture_image_load(&img, overlay_resolved_path))
{
RARCH_ERR("[Overlay]: Failed to load image: %s.\n",
overlay_resolved_path);
ol->loading_status = OVERLAY_IMAGE_TRANSFER_ERROR;
goto error;
}
overlay->image = img;
}
snprintf(overlay->config.names.key, sizeof(overlay->config.names.key), snprintf(overlay->config.names.key, sizeof(overlay->config.names.key),
"overlay%u_name", i); "overlay%u_name", i);
config_get_array(conf, overlay->config.names.key, config_get_array(conf, overlay->config.names.key,