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

Refactor deferred_push_content_actions

Browse Source
This commit is contained in:
twinaphex 2015-01-26 06:08:18 +01:00
parent e1d20b3b12
commit 7f0ac2565a
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/menu_entries.c
View File

@ -102,7 +102,8 @@ static void menu_entries_content_list_push(
if (!info) if (!info)
return; return;
str_list = (struct string_list*)dir_list_new(path, info->supported_extensions, true); str_list = (struct string_list*)dir_list_new(path,
info->supported_extensions, true);
dir_list_sort(str_list, true); dir_list_sort(str_list, true);
@ -112,7 +113,8 @@ static void menu_entries_content_list_push(
for (j = 0; j < num_items; j++) for (j = 0; j < num_items; j++)
{ {
if (str_list->elems[j].attr.i == RARCH_DIRECTORY) if (str_list->elems[j].attr.i == RARCH_DIRECTORY)
menu_entries_content_list_push(list, info, str_list->elems[j].data); menu_entries_content_list_push(list, info,
str_list->elems[j].data);
else else
menu_list_push( menu_list_push(
list, list,
@ -146,7 +148,8 @@ int menu_entries_push_horizontal_menu_list(menu_handle_t *menu,
return -1; return -1;
if (!info->supports_no_game) if (!info->supports_no_game)
menu_entries_content_list_push(list, info, g_settings.content_directory); menu_entries_content_list_push(list, info,
g_settings.content_directory);
else else
menu_list_push( menu_list_push(
list, list,
@ -164,7 +167,8 @@ int menu_entries_push_horizontal_menu_list(menu_handle_t *menu,
{ {
struct string_list *strlist = info->databases_list; struct string_list *strlist = info->databases_list;
fill_pathname_join(db_path, g_settings.content_database, strlist->elems[i].data, sizeof(db_path)); fill_pathname_join(db_path, g_settings.content_database,
strlist->elems[i].data, sizeof(db_path));
strlcat(db_path, ".rdb", sizeof(db_path)); strlcat(db_path, ".rdb", sizeof(db_path));
if (path_file_exists(db_path)) if (path_file_exists(db_path))

15
menu/menu_entries_cbs.c
View File

@ -2399,20 +2399,7 @@ static int deferred_push_content_actions(void *data, void *userdata,
static int deferred_push_content_list(void *data, void *userdata, static int deferred_push_content_list(void *data, void *userdata,
const char *path, const char *label, unsigned type) const char *path, const char *label, unsigned type)
{ {
file_list_t *list = (file_list_t*)data; return menu_entries_deferred_push(data, driver.menu->menu_list->selection_buf);
(void)userdata;
if (!list || !driver.menu)
return -1;
menu_navigation_clear(driver.menu, true);
if (driver.menu->cat_selection_ptr == 0)
return menu_entries_push_list(driver.menu, driver.menu->menu_list->selection_buf,
"", "Main Menu", 0, SL_FLAG_MAIN_MENU);
else
return menu_entries_push_horizontal_menu_list(driver.menu, driver.menu->menu_list->selection_buf,
"", "Horizontal Menu", 0);
} }
static int deferred_push_database_manager_list(void *data, void *userdata, static int deferred_push_database_manager_list(void *data, void *userdata,