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

(RMenu) Clean up init_filebrowser and free_filebrowser - make part of 

RMenu
This commit is contained in:
twinaphex 2013-03-25 21:01:04 +01:00
parent fee0d9d77a
commit 8568246454
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
frontend/menu/rmenu.c
View File

@ -3459,35 +3459,10 @@ static int menu_input_process(void *data, void *state)
return 0; return 0;
} }
/*============================================================
RESOURCE CALLBACKS
============================================================ */
void init_filebrowser(void *data)
{
(void)data;
browser = (filebrowser_t*)filebrowser_init(g_extern.console.main_wrap.default_rom_startup_dir, g_extern.system.valid_extensions);
tmpBrowser = (filebrowser_t*)filebrowser_init(default_paths.filesystem_root_dir, "");
menu_stack_push(FILE_BROWSER_MENU);
filebrowser_set_root_and_ext(browser, g_extern.system.valid_extensions, g_extern.console.main_wrap.default_rom_startup_dir);
filebrowser_set_root_and_ext(tmpBrowser, NULL, default_paths.filesystem_root_dir);
}
void free_filebrowser(void *data)
{
(void)data;
filebrowser_free(browser);
filebrowser_free(tmpBrowser);
}
/*============================================================ /*============================================================
RMENU API RMENU API
============================================================ */ ============================================================ */
void menu_init(void) void menu_init(void)
{ {
DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data; DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
@ -3495,14 +3470,21 @@ void menu_init(void)
rmenu_state.input = 0; rmenu_state.input = 0;
rmenu_state.old_state = 0; rmenu_state.old_state = 0;
init_filebrowser(&rmenu_state); browser = (filebrowser_t*)filebrowser_init(g_extern.console.main_wrap.default_rom_startup_dir, g_extern.system.valid_extensions);
tmpBrowser = (filebrowser_t*)filebrowser_init(default_paths.filesystem_root_dir, "");
filebrowser_set_root_and_ext(browser, g_extern.system.valid_extensions, g_extern.console.main_wrap.default_rom_startup_dir);
filebrowser_set_root_and_ext(tmpBrowser, NULL, default_paths.filesystem_root_dir);
menu_stack_push(FILE_BROWSER_MENU);
device_ptr->ctx_driver->rmenu_init(); device_ptr->ctx_driver->rmenu_init();
} }
void menu_free(void) void menu_free(void)
{ {
free_filebrowser(&rmenu_state); filebrowser_free(browser);
filebrowser_free(tmpBrowser);
} }
bool menu_iterate(void) bool menu_iterate(void)