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

(RGUI) Move menu_stack code back into rgui.c

Browse Source
This commit is contained in:
twinaphex 2013-04-18 22:22:25 +02:00
parent fbb82177f3
commit 16a40af173
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/menu/menu_common.c
View File

@ -392,15 +392,6 @@ void menu_init(void)
sizeof(rgui->browser->current_dir.root_dir));
filebrowser_iterate(rgui->browser, FILEBROWSER_ACTION_RESET);
#else
strlcpy(rgui->base_path, g_settings.rgui_browser_directory, sizeof(rgui->base_path));
rgui->menu_stack = (rgui_list_t*)calloc(1, sizeof(rgui_list_t));
rgui->selection_buf = (rgui_list_t*)calloc(1, sizeof(rgui_list_t));
rgui_list_push(rgui->menu_stack, g_settings.rgui_browser_directory, RGUI_FILE_DIRECTORY, 0);
rgui_list_push(rgui->menu_stack, "", RGUI_SETTINGS, 0);
rgui_iterate(rgui, RGUI_ACTION_REFRESH);
#endif
#ifdef HAVE_SHADER_MANAGER
@ -414,9 +405,6 @@ void menu_free(void)
#ifdef HAVE_FILEBROWSER
filebrowser_free(rgui->browser);
#else
rgui_list_free(rgui->menu_stack);
rgui_list_free(rgui->selection_buf);
#endif
free(rgui);

14
frontend/menu/rgui.c
View File

@ -198,13 +198,22 @@ rgui_handle_t *rgui_init(void)
else
{
RARCH_ERR("no font bmp or bin, abort");
return NULL;
/* TODO - should be refactored - perhaps don't do rarch_fail but instead
* exit program */
g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_MENU_INGAME) | (1ULL << MODE_GAME));
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
return NULL;
}
strlcpy(rgui->base_path, g_settings.rgui_browser_directory, sizeof(rgui->base_path));
rgui->menu_stack = (rgui_list_t*)calloc(1, sizeof(rgui_list_t));
rgui->selection_buf = (rgui_list_t*)calloc(1, sizeof(rgui_list_t));
rgui_list_push(rgui->menu_stack, g_settings.rgui_browser_directory, RGUI_FILE_DIRECTORY, 0);
rgui_list_push(rgui->menu_stack, "", RGUI_SETTINGS, 0);
rgui_iterate(rgui, RGUI_ACTION_REFRESH);
return rgui;
}
@ -216,6 +225,9 @@ void rgui_free(rgui_handle_t *rgui)
#ifdef HAVE_DYNAMIC
libretro_free_system_info(&rgui->info);
#endif
rgui_list_free(rgui->menu_stack);
rgui_list_free(rgui->selection_buf);
}
static uint16_t gray_filler(unsigned x, unsigned y)