mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 07:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove core_info_list_get_all_extensions

Browse Source
This commit is contained in:
twinaphex 2016-02-07 16:10:42 +01:00
parent 9d96e9e452
commit 452df47c14
4 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core_info.c
View File

@ -476,15 +476,6 @@ static bool core_info_does_support_file(
core->supported_extensions_list, ".", path_get_extension(path)); core->supported_extensions_list, ".", path_get_extension(path));
} }
const char *core_info_list_get_all_extensions(void)
{
core_info_list_t *list = NULL;
core_info_ctl(CORE_INFO_CTL_LIST_GET, &list);
if (!list)
return NULL;
return list->all_ext;
}
/* qsort_r() is not in standard C, sadly. */ /* qsort_r() is not in standard C, sadly. */
static int core_info_qsort_cmp(const void *a_, const void *b_) static int core_info_qsort_cmp(const void *a_, const void *b_)

2
core_info.h
View File

@ -100,8 +100,6 @@ void core_info_list_update_missing_firmware(core_info_list_t *list,
bool core_info_list_get_info(core_info_list_t *list, bool core_info_list_get_info(core_info_list_t *list,
core_info_t *info, const char *path); core_info_t *info, const char *path);
const char *core_info_list_get_all_extensions(void);
bool core_info_list_get_display_name(core_info_list_t *list, bool core_info_list_get_display_name(core_info_list_t *list,
const char *path, char *s, size_t len); const char *path, char *s, size_t len);

9
dir_list_special.c
View File

@ -45,8 +45,13 @@ struct string_list *dir_list_new_special(const char *input_dir,
exts = ext_name; exts = ext_name;
break; break;
case DIR_LIST_CORE_INFO: case DIR_LIST_CORE_INFO:
dir = input_dir; {
exts = core_info_list_get_all_extensions(); core_info_list_t *list = NULL;
core_info_ctl(CORE_INFO_CTL_LIST_GET, &list);
dir = input_dir;
exts = list->all_ext;
}
break; break;
case DIR_LIST_SHADERS: case DIR_LIST_SHADERS:
dir = settings->video.shader_dir; dir = settings->video.shader_dir;

12
menu/cbs/menu_cbs_deferred_push.c
View File

@ -328,8 +328,10 @@ static int general_push(menu_displaylist_info_t *info,
struct retro_system_info *system_menu = NULL; struct retro_system_info *system_menu = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
rarch_system_info_t *system = NULL; rarch_system_info_t *system = NULL;
core_info_list_t *list = NULL;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
const char *exts = core_info_list_get_all_extensions();
core_info_ctl(CORE_INFO_CTL_LIST_GET, &list);
menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET, &system_menu); menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET, &system_menu);
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system); runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
@ -354,8 +356,8 @@ static int general_push(menu_displaylist_info_t *info,
case PUSH_ARCHIVE_OPEN_DETECT_CORE: case PUSH_ARCHIVE_OPEN_DETECT_CORE:
info->setting = menu_setting_find(info->label); info->setting = menu_setting_find(info->label);
if (exts) if (!string_is_empty(list->all_ext))
strlcpy(info->exts, exts, sizeof(info->exts)); strlcpy(info->exts, list->all_ext, sizeof(info->exts));
else if (system_menu->valid_extensions) else if (system_menu->valid_extensions)
{ {
if (*system_menu->valid_extensions) if (*system_menu->valid_extensions)
@ -391,8 +393,8 @@ static int general_push(menu_displaylist_info_t *info,
strlcpy(info->exts, system->valid_extensions, sizeof(info->exts)); strlcpy(info->exts, system->valid_extensions, sizeof(info->exts));
break; break;
case PUSH_DETECT_CORE_LIST: case PUSH_DETECT_CORE_LIST:
if (exts) if (!string_is_empty(list->all_ext))
strlcpy(info->exts, exts, sizeof(info->exts)); strlcpy(info->exts, list->all_ext, sizeof(info->exts));
break; break;
} }