CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-22 10:49:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move core_info stuff to menu_common.

Browse Source
This commit is contained in:
Themaister 2013-10-06 12:31:04 +02:00
parent c813e787cb
commit 8c768b0207
3 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
frontend/menu/menu_common.c
View File

@ -947,3 +947,37 @@ void menu_key_event(bool down, unsigned keycode, uint32_t character, uint16_t ke
(void)key_modifiers;
}
void menu_resolve_libretro_names(rgui_list_t *list, const char *dir)
{
for (size_t i = 0; i < list->size; i++)
{
const char *path;
unsigned type = 0;
rgui_list_get_at_offset(list, i, &path, &type);
if (type != RGUI_FILE_PLAIN)
continue;
char core_path[PATH_MAX];
fill_pathname_join(core_path, dir, path, sizeof(core_path));
char display_name[256];
if (rgui->core_info &&
core_info_list_get_display_name(rgui->core_info,
core_path, display_name, sizeof(display_name)))
rgui_list_set_alt_at_offset(list, i, display_name);
}
}
void menu_resolve_supported_cores(rgui_handle_t *rgui)
{
const core_info_t *info = NULL;
size_t cores = 0;
core_info_list_get_supported_cores(rgui->core_info, rgui->deferred_path, &info, &cores);
for (size_t i = 0; i < cores; i++)
{
rgui_list_push(rgui->selection_buf, info[i].path, RGUI_FILE_PLAIN, 0);
rgui_list_set_alt_at_offset(rgui->selection_buf, i, info[i].display_name);
}
}

3
frontend/menu/menu_common.h
View File

@ -351,6 +351,9 @@ void shader_manager_set_preset(struct gfx_shader *shader,
void menu_ticker_line(char *buf, size_t len, unsigned tick, const char *str, bool selected);
void menu_resolve_libretro_names(rgui_list_t *list, const char *dir);
void menu_resolve_supported_cores(rgui_handle_t *rgui);
void load_menu_game_prepare(void);
bool load_menu_game(void);
void load_menu_game_history(unsigned game_index);

37
frontend/menu/rgui.c
View File

@ -201,39 +201,6 @@ static int rgui_core_setting_toggle(unsigned setting, rgui_action_t action)
return 0;
}
static void rgui_resolve_libretro_names(rgui_list_t *list, const char *dir)
{
for (size_t i = 0; i < list->size; i++)
{
const char *path;
unsigned type = 0;
rgui_list_get_at_offset(list, i, &path, &type);
if (type != RGUI_FILE_PLAIN)
continue;
char core_path[PATH_MAX];
fill_pathname_join(core_path, dir, path, sizeof(core_path));
char display_name[256];
if (rgui->core_info &&
core_info_list_get_display_name(rgui->core_info,
core_path, display_name, sizeof(display_name)))
rgui_list_set_alt_at_offset(list, i, display_name);
}
}
static void rgui_resolve_supported_cores(rgui_handle_t *rgui)
{
const core_info_t *info = NULL;
size_t cores = 0;
core_info_list_get_supported_cores(rgui->core_info, rgui->deferred_path, &info, &cores);
for (size_t i = 0; i < cores; i++)
{
rgui_list_push(rgui->selection_buf, info[i].path, RGUI_FILE_PLAIN, 0);
rgui_list_set_alt_at_offset(rgui->selection_buf, i, info[i].display_name);
}
}
static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, rgui_action_t action, unsigned menu_type)
{
#ifdef HAVE_SHADER_MANAGER
@ -1495,9 +1462,9 @@ static int rgui_iterate(void *data, unsigned action)
rgui_directory_parse(rgui, dir, menu_type, rgui->selection_buf);
if (menu_type == RGUI_SETTINGS_CORE)
rgui_resolve_libretro_names(rgui->selection_buf, dir);
menu_resolve_libretro_names(rgui->selection_buf, dir);
else if (menu_type == RGUI_SETTINGS_DEFERRED_CORE)
rgui_resolve_supported_cores(rgui);
menu_resolve_supported_cores(rgui);
// Before a refresh, we could have deleted a file on disk, causing
// selection_ptr to suddendly be out of range. Ensure it doesn't overflow.