mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 06:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

(task_content.c) Some more cleanups

Browse Source
This commit is contained in:
twinaphex 2018-10-29 04:59:54 +01:00
parent e6dfa35f9d
commit 03dac742cb
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
tasks/task_content.c
View File

@ -452,12 +452,14 @@ error:
return false; return false;
} }
/* Try to extract all content we're going to load if appropriate. */
static bool content_file_init_extract( static bool content_file_init_extract(
struct string_list *content, struct string_list *content,
content_information_ctx_t *content_ctx, content_information_ctx_t *content_ctx,
const struct retro_subsystem_info *special, const struct retro_subsystem_info *special,
union string_list_elem_attr *attr, char **error_string,
char **error_string union string_list_elem_attr *attr
) )
{ {
unsigned i; unsigned i;
@ -725,16 +727,16 @@ error:
return NULL; return NULL;
} }
static bool content_file_init_set_attribs( static void content_file_init_set_attribs(
struct string_list *content, struct string_list *content,
const struct retro_subsystem_info *special, const struct retro_subsystem_info *special,
content_information_ctx_t *content_ctx, content_information_ctx_t *content_ctx,
char **error_string) char **error_string,
union string_list_elem_attr *attr)
{ {
union string_list_elem_attr attr;
struct string_list *subsystem = path_get_subsystem_list(); struct string_list *subsystem = path_get_subsystem_list();
attr.i = 0; attr->i = 0;
if (!path_is_empty(RARCH_PATH_SUBSYSTEM) && special) if (!path_is_empty(RARCH_PATH_SUBSYSTEM) && special)
{ {
@ -742,11 +744,11 @@ static bool content_file_init_set_attribs(
for (i = 0; i < subsystem->size; i++) for (i = 0; i < subsystem->size; i++)
{ {
attr.i = special->roms[i].block_extract; attr->i = special->roms[i].block_extract;
attr.i |= special->roms[i].need_fullpath << 1; attr->i |= special->roms[i].need_fullpath << 1;
attr.i |= special->roms[i].required << 2; attr->i |= special->roms[i].required << 2;
string_list_append(content, subsystem->elems[i].data, attr); string_list_append(content, subsystem->elems[i].data, *attr);
} }
} }
else else
@ -756,26 +758,20 @@ static bool content_file_init_set_attribs(
content_get_status(&contentless, &is_inited); content_get_status(&contentless, &is_inited);
attr.i = content_ctx->block_extract; attr->i = content_ctx->block_extract;
attr.i |= content_ctx->need_fullpath << 1; attr->i |= content_ctx->need_fullpath << 1;
attr.i |= (!contentless) << 2; attr->i |= (!contentless) << 2;
if (path_is_empty(RARCH_PATH_CONTENT) if (path_is_empty(RARCH_PATH_CONTENT)
&& contentless && contentless
&& content_ctx->set_supports_no_game_enable) && content_ctx->set_supports_no_game_enable)
string_list_append(content, "", attr); string_list_append(content, "", *attr);
else else
{ {
if (!path_is_empty(RARCH_PATH_CONTENT)) if (!path_is_empty(RARCH_PATH_CONTENT))
string_list_append(content, path_get(RARCH_PATH_CONTENT), attr); string_list_append(content, path_get(RARCH_PATH_CONTENT), *attr);
} }
} }
#ifdef HAVE_COMPRESSION
/* Try to extract all content we're going to load if appropriate. */
content_file_init_extract(content, content_ctx, special, &attr, error_string);
#endif
return true;
} }
/** /**
@ -791,6 +787,7 @@ static bool content_file_init(
struct string_list *content, struct string_list *content,
char **error_string) char **error_string)
{ {
union string_list_elem_attr attr;
struct retro_game_info *info = NULL; struct retro_game_info *info = NULL;
bool ret = bool ret =
path_is_empty(RARCH_PATH_SUBSYSTEM) path_is_empty(RARCH_PATH_SUBSYSTEM)
@ -799,10 +796,15 @@ static bool content_file_init(
path_is_empty(RARCH_PATH_SUBSYSTEM) path_is_empty(RARCH_PATH_SUBSYSTEM)
? NULL : content_file_init_subsystem(content_ctx->subsystem.data, ? NULL : content_file_init_subsystem(content_ctx->subsystem.data,
content_ctx->subsystem.size, error_string, &ret); content_ctx->subsystem.size, error_string, &ret);
if ( !ret ||
!content_file_init_set_attribs(content, special, content_ctx, error_string)) if (!ret)
return false; return false;
content_file_init_set_attribs(content, special, content_ctx, error_string, &attr);
#ifdef HAVE_COMPRESSION
content_file_init_extract(content, content_ctx, special, error_string, &attr);
#endif
if (content->size > 0) if (content->size > 0)
info = (struct retro_game_info*) info = (struct retro_game_info*)
calloc(content->size, sizeof(*info)); calloc(content->size, sizeof(*info));
@ -821,7 +823,7 @@ static bool content_file_init(
free(info); free(info);
} }
else if (special == NULL) else if (!special)
{ {
*error_string = strdup(msg_hash_to_str(MSG_ERROR_LIBRETRO_CORE_REQUIRES_CONTENT)); *error_string = strdup(msg_hash_to_str(MSG_ERROR_LIBRETRO_CORE_REQUIRES_CONTENT));
ret = false; ret = false;
@ -885,11 +887,7 @@ static bool task_load_content(content_ctx_info_t *content_info,
bool is_inited = false; bool is_inited = false;
if (!content_load(content_info)) if (!content_load(content_info))
{
return false; return false;
}
content_get_status(&contentless, &is_inited); content_get_status(&contentless, &is_inited);