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

(Filebrowser) Get rid of unnecessary filebrowser_init

This commit is contained in:
twinaphex 2013-04-11 23:00:01 +02:00
parent da8bbde11d
commit 9d53311e33
4 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/menu/rmenu.c
View File

@ -3368,11 +3368,21 @@ static int menu_input_process(uint8_t menu_type, uint64_t old_state)
void menu_init(void) void menu_init(void)
{ {
browser = (filebrowser_t*)filebrowser_init(g_extern.console.main_wrap.default_rom_startup_dir, g_extern.system.valid_extensions); browser = (filebrowser_t*)calloc(1, sizeof(*browser));
tmpBrowser = (filebrowser_t*)filebrowser_init(default_paths.filesystem_root_dir, ""); tmpBrowser = (filebrowser_t*)calloc(1, sizeof(*tmpBrowser));
filebrowser_set_root_and_ext(browser, g_extern.system.valid_extensions, g_extern.console.main_wrap.default_rom_startup_dir); strlcpy(browser->extensions, g_extern.system.valid_extensions,
filebrowser_set_root_and_ext(tmpBrowser, NULL, default_paths.filesystem_root_dir); sizeof(browser->extensions));
strlcpy(browser->root_dir, g_extern.console.main_wrap.default_rom_startup_dir,
sizeof(browser->root_dir));
strlcpy(tmpBrowser->extensions, "",
sizeof(tmpBrowser->extensions));
strlcpy(tmpBrowser->root_dir, default_paths.filesystem_root_dir,
sizeof(tmpBrowser->root_dir));
filebrowser_iterate(browser, FILEBROWSER_ACTION_RESET);
filebrowser_iterate(tmpBrowser, FILEBROWSER_ACTION_RESET);
menu_stack_push(FILE_BROWSER_MENU); menu_stack_push(FILE_BROWSER_MENU);

17
frontend/menu/rmenu_xui.cpp
View File

@ -1337,8 +1337,21 @@ void menu_init (void)
return; return;
} }
browser = (filebrowser_t*)filebrowser_init(default_paths.filebrowser_startup_dir, g_extern.system.valid_extensions); browser = (filebrowser_t*)calloc(1, sizeof(*browser));
tmp_browser = (filebrowser_t*)filebrowser_init(default_paths.filebrowser_startup_dir, ""); tmpBrowser = (filebrowser_t*)calloc(1, sizeof(*tmpBrowser));
strlcpy(browser->extensions, g_extern.system.valid_extensions,
sizeof(browser->extensions));
strlcpy(browser->root_dir, default_paths.filebrowser_startup_dir,
sizeof(browser->root_dir));
strlcpy(tmpBrowser->extensions, "",
sizeof(tmpBrowser->extensions));
strlcpy(tmpBrowser->root_dir, default_paths.filebrowser_startup_dir,
sizeof(tmpBrowser->root_dir));
filebrowser_iterate(browser, FILEBROWSER_ACTION_RESET);
filebrowser_iterate(tmpBrowser, FILEBROWSER_ACTION_RESET);
} }
void menu_free (void) void menu_free (void)

7
frontend/menu/utils/file_browser.c
View File

@ -46,13 +46,6 @@ const char *path, const char * extensions)
return false; return false;
} }
void *filebrowser_init(const char *start_dir, const char *extensions)
{
filebrowser_t *filebrowser = (filebrowser_t*)calloc(1, sizeof(*filebrowser));
directory_parse(filebrowser, 0, start_dir, extensions);
return filebrowser;
}
void filebrowser_free(void *data) void filebrowser_free(void *data)
{ {
filebrowser_t *filebrowser = (filebrowser_t*)data; filebrowser_t *filebrowser = (filebrowser_t*)data;

2
frontend/menu/utils/file_browser.h
View File

@ -51,6 +51,4 @@ void filebrowser_set_root_and_ext(void *data, const char *ext, const char *root_
void filebrowser_free(void *data); void filebrowser_free(void *data);
bool filebrowser_iterate(void *data, unsigned action); bool filebrowser_iterate(void *data, unsigned action);
void *filebrowser_init(const char *start_dir, const char *extensions);
#endif /* FILEBROWSER_H_ */ #endif /* FILEBROWSER_H_ */