mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split up code in input_overlay_load_overlays_iterate

Browse Source
This commit is contained in:
twinaphex 2015-02-23 07:26:34 +01:00
parent a4a451f8d7
commit 35bc3a2b3e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
input/input_overlay.c
View File

@ -334,8 +334,6 @@ static bool input_overlay_load_overlay_image(input_overlay_t *ol,
if (config_get_path(conf, overlay_path_key,
overlay_path, sizeof(overlay_path)))
{
ol->loading_status = OVERLAY_IMAGE_TRANSFER_BUSY;
struct texture_image img = {0};
fill_pathname_resolve_relative(overlay_resolved_path, config_path,
@ -350,8 +348,6 @@ static bool input_overlay_load_overlay_image(input_overlay_t *ol,
ol->loading_status = OVERLAY_IMAGE_TRANSFER_ERROR;
return false;
}
ol->loading_status = OVERLAY_IMAGE_TRANSFER_DONE;
}
return true;
@ -585,6 +581,9 @@ bool input_overlay_load_overlays_iterate(input_overlay_t *ol)
switch (ol->loading_status)
{
case OVERLAY_IMAGE_TRANSFER_NONE:
ol->loading_status = OVERLAY_IMAGE_TRANSFER_BUSY;
break;
case OVERLAY_IMAGE_TRANSFER_BUSY:
if (!input_overlay_load_overlay_image(ol, ol->conf,
ol->overlay_path, &ol->overlays[ol->pos], ol->pos))
{
@ -599,14 +598,14 @@ bool input_overlay_load_overlays_iterate(input_overlay_t *ol)
goto error;
}
ol->pos += 1;
break;
case OVERLAY_IMAGE_TRANSFER_BUSY:
ol->loading_status = OVERLAY_IMAGE_TRANSFER_DONE;
break;
case OVERLAY_IMAGE_TRANSFER_DONE:
ol->pos += 1;
ol->loading_status = OVERLAY_IMAGE_TRANSFER_NONE;
break;
case OVERLAY_IMAGE_TRANSFER_ERROR:
break;
goto error;
}
return true;