ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(task_overlay.c) Cleanup

This commit is contained in:
twinaphex 2016-05-24 02:17:38 +02:00
parent b3cab9223c
commit 8f054aeb29
1 changed files with 25 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tasks/task_overlay.c
View File

@ -131,13 +131,15 @@ static bool rarch_task_overlay_load_desc(
if (by_pixel && (width == 0 || height == 0))
{
RARCH_ERR("[Overlay]: Base overlay is not set and not using normalized coordinates.\n");
goto error;
ret = false;
goto end;
}
if (!config_get_array(conf, overlay_desc_key, overlay, sizeof(overlay)))
{
RARCH_ERR("[Overlay]: Didn't find key: %s.\n", overlay_desc_key);
goto error;
ret = false;
goto end;
}
list = string_split(overlay, ", ");
@ -145,13 +147,15 @@ static bool rarch_task_overlay_load_desc(
if (!list)
{
RARCH_ERR("[Overlay]: Failed to split overlay desc.\n");
goto error;
ret = false;
goto end;
}
if (list->size < 6)
{
RARCH_ERR("[Overlay]: Overlay desc is invalid. Requires at least 6 tokens.\n");
goto error;
ret = false;
goto end;
}
key = list->elems[0].data;
@ -294,21 +298,13 @@ end:
if (list)
string_list_free(list);
return ret;
error:
if (list)
string_list_free(list);
return false;
}
static void rarch_task_overlay_deferred_loading(overlay_loader_t *loader)
{
size_t i = 0;
bool not_done = true;
struct overlay *overlay = NULL;
overlay = &loader->overlays[loader->pos];
not_done = loader->pos < loader->size;
struct overlay *overlay = &loader->overlays[loader->pos];
bool not_done = loader->pos < loader->size;
if (!not_done)
{
@ -361,9 +357,9 @@ static void rarch_task_overlay_deferred_loading(overlay_loader_t *loader)
{
RARCH_ERR("[Overlay]: Failed to load overlay descs for overlay #%u.\n",
(unsigned)overlay->pos);
goto error;
loader->state = OVERLAY_STATUS_DEFERRED_ERROR;
break;
}
}
else
{
@ -371,7 +367,6 @@ static void rarch_task_overlay_deferred_loading(overlay_loader_t *loader)
loader->loading_status = OVERLAY_IMAGE_TRANSFER_DESC_DONE;
break;
}
}
break;
case OVERLAY_IMAGE_TRANSFER_DESC_DONE:
@ -382,13 +377,9 @@ static void rarch_task_overlay_deferred_loading(overlay_loader_t *loader)
loader->loading_status = OVERLAY_IMAGE_TRANSFER_NONE;
break;
case OVERLAY_IMAGE_TRANSFER_ERROR:
goto error;
}
return;
error:
loader->state = OVERLAY_STATUS_DEFERRED_ERROR;
break;
}
}
static void rarch_task_overlay_deferred_load(overlay_loader_t *loader)
@ -585,9 +576,7 @@ static bool rarch_task_overlay_resolve_targets(struct overlay *ol,
static void rarch_task_overlay_resolve_iterate(overlay_loader_t *loader)
{
bool not_done = true;
not_done = loader->resolve_pos < loader->size;
bool not_done = loader->resolve_pos < loader->size;
if (!not_done)
{
@ -599,7 +588,8 @@ static void rarch_task_overlay_resolve_iterate(overlay_loader_t *loader)
loader->resolve_pos, loader->size))
{
RARCH_ERR("[Overlay]: Failed to resolve next targets.\n");
goto error;
loader->state = OVERLAY_STATUS_DEFERRED_ERROR;
return;
}
if (loader->resolve_pos == 0)
@ -614,10 +604,6 @@ static void rarch_task_overlay_resolve_iterate(overlay_loader_t *loader)
}
loader->resolve_pos += 1;
return;
error:
loader->state = OVERLAY_STATUS_DEFERRED_ERROR;
}
static void rarch_task_overlay_handler(retro_task_t *task)