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

Revert "Sort cores directly in core_info_list_new, so Lakka and XMB get a sorted core list" 

This reverts commit d8d6984cd2.
This commit is contained in:
twinaphex 2014-12-12 20:25:57 +01:00
parent b5e19ec6d7
commit 1a1c9aaeb3
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
core_info.c
View File

@ -97,25 +97,6 @@ static void core_info_list_resolve_all_firmware(
} }
} }
/* qsort_r() is not in standard C, sadly. */
static const char *core_info_tmp_path;
static const struct string_list *core_info_tmp_list;
static int core_info_qsort_cmp(const void *a_, const void *b_)
{
const core_info_t *a = (const core_info_t*)a_;
const core_info_t *b = (const core_info_t*)b_;
int support_a = core_info_does_support_any_file(a, core_info_tmp_list) ||
core_info_does_support_file(a, core_info_tmp_path);
int support_b = core_info_does_support_any_file(b, core_info_tmp_list) ||
core_info_does_support_file(b, core_info_tmp_path);
if (support_a != support_b)
return support_b - support_a;
return strcasecmp(a->display_name, b->display_name);
}
core_info_list_t *core_info_list_new(const char *modules_path) core_info_list_t *core_info_list_new(const char *modules_path)
{ {
size_t i; size_t i;
@ -212,9 +193,6 @@ core_info_list_t *core_info_list_new(const char *modules_path)
core_info_list_resolve_all_extensions(core_info_list); core_info_list_resolve_all_extensions(core_info_list);
core_info_list_resolve_all_firmware(core_info_list); core_info_list_resolve_all_firmware(core_info_list);
qsort(core_info_list->list, core_info_list->count,
sizeof(core_info_t), core_info_qsort_cmp);
dir_list_free(contents); dir_list_free(contents);
return core_info_list; return core_info_list;
@ -372,6 +350,25 @@ const char *core_info_list_get_all_extensions(core_info_list_t *core_info_list)
return ""; return "";
} }
/* qsort_r() is not in standard C, sadly. */
static const char *core_info_tmp_path;
static const struct string_list *core_info_tmp_list;
static int core_info_qsort_cmp(const void *a_, const void *b_)
{
const core_info_t *a = (const core_info_t*)a_;
const core_info_t *b = (const core_info_t*)b_;
int support_a = core_info_does_support_any_file(a, core_info_tmp_list) ||
core_info_does_support_file(a, core_info_tmp_path);
int support_b = core_info_does_support_any_file(b, core_info_tmp_list) ||
core_info_does_support_file(b, core_info_tmp_path);
if (support_a != support_b)
return support_b - support_a;
return strcasecmp(a->display_name, b->display_name);
}
void core_info_list_get_supported_cores(core_info_list_t *core_info_list, void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
const char *path, const core_info_t **infos, size_t *num_infos) const char *path, const core_info_t **infos, size_t *num_infos)
{ {