mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-29 18:32:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RMenu) Put filebrowser instances on heap

Browse Source
This commit is contained in:
twinaphex 2013-01-07 23:29:56 +01:00
parent 06be0e521d
commit 88653cbc10
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
console/fileio/file_browser.c
View File

@ -43,13 +43,17 @@ const char *path, const char * extensions)
return false;
}
static bool filebrowser_new(void *data, const char *start_dir,
const char *extensions)
filebrowser_t *filebrowser_init(const char *start_dir, const char *extensions)
{
filebrowser_t *filebrowser = (filebrowser_t*)calloc(1, sizeof(*filebrowser));
filebrowser_parse_directory(filebrowser, 0, start_dir, extensions);
return filebrowser;
}
static bool filebrowser_reset(void *data, const char *start_dir, const char *extensions)
{
filebrowser_t *filebrowser = (filebrowser_t*)data;
bool ret = filebrowser_parse_directory(filebrowser, 0, start_dir, extensions);
return ret;
}
@ -72,9 +76,9 @@ void filebrowser_free(void *data)
filebrowser_t *filebrowser = (filebrowser_t*)data;
dir_list_free(filebrowser->current_dir.list);
filebrowser->current_dir.list = NULL;
filebrowser->current_dir.ptr = 0;
free(filebrowser);
}
static bool filebrowser_push_directory(void *data, const char * path,
@ -210,7 +214,7 @@ bool filebrowser_iterate(void *data, unsigned action)
ret = filebrowser_pop_directory(filebrowser);
break;
case FILEBROWSER_ACTION_RESET:
ret = filebrowser_new(filebrowser, filebrowser->root_dir, filebrowser->extensions);
ret = filebrowser_reset(filebrowser, filebrowser->root_dir, filebrowser->extensions);
break;
case FILEBROWSER_ACTION_NOOP:
default:

2
console/fileio/file_browser.h
View File

@ -57,4 +57,6 @@ void filebrowser_free(void *data);
void filebrowser_set_current_at (void *dat, size_t pos);
bool filebrowser_iterate(void *data, unsigned action);
filebrowser_t *filebrowser_init(const char *start_dir, const char *extensions);
#endif /* FILEBROWSER_H_ */

29
console/rmenu/rmenu.c
View File

@ -54,8 +54,8 @@ rmenu_state_t rmenu_state;
static bool set_libretro_core_as_launch;
filebrowser_t browser;
filebrowser_t tmpBrowser;
filebrowser_t *browser;
filebrowser_t *tmpBrowser;
unsigned set_shader = 0;
unsigned currently_selected_controller_menu = 0;
@ -483,7 +483,7 @@ static void display_menubar(void *data)
{
menu *current_menu = (menu*)data;
DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
filebrowser_t *fb = &browser;
filebrowser_t *fb = browser;
char current_path[256], rarch_version[128], msg[128];
rmenu_default_positions_t default_pos;
@ -528,7 +528,7 @@ static void display_menubar(void *data)
#endif
case PATH_SRAM_DIR_CHOICE:
case PATH_SYSTEM_DIR_CHOICE:
fb = &tmpBrowser;
fb = tmpBrowser;
case FILE_BROWSER_MENU:
snprintf(current_path, sizeof(current_path), "PATH: %s", filebrowser_get_current_dir(fb));
device_ptr->font_ctx->render_msg_place(device_ptr,default_pos.x_position, default_pos.current_path_y_position, default_pos.current_path_font_size, WHITE, current_path);
@ -626,7 +626,7 @@ int select_file(void *data, void *state)
char extensions[256], comment[256], path[PATH_MAX];
bool ret = true;
filebrowser_t *filebrowser = &tmpBrowser;
filebrowser_t *filebrowser = tmpBrowser;
rmenu_default_positions_t default_pos;
device_ptr->ctx_driver->rmenu_set_default_pos(&default_pos);
@ -761,7 +761,7 @@ int select_directory(void *data, void *state)
char path[PATH_MAX], msg[256];
bool ret = true;
filebrowser_t *filebrowser = &tmpBrowser;
filebrowser_t *filebrowser = tmpBrowser;
rmenu_default_positions_t default_pos;
device_ptr->ctx_driver->rmenu_set_default_pos(&default_pos);
@ -1016,7 +1016,7 @@ static void set_setting_action(void *data, unsigned switchvalue, uint64_t input)
{
(void)data;
DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
filebrowser_t *filebrowser = &tmpBrowser;
filebrowser_t *filebrowser = tmpBrowser;
switch(switchvalue)
{
@ -1785,7 +1785,7 @@ int select_rom(void *data, void *state)
DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
char msg[128];
rmenu_default_positions_t default_pos;
filebrowser_t *filebrowser = &browser;
filebrowser_t *filebrowser = browser;
device_ptr->ctx_driver->rmenu_set_default_pos(&default_pos);
@ -2059,7 +2059,7 @@ int ingame_menu(void *data, void *state)
unsigned menuitem_colors[MENU_ITEM_LAST];
static unsigned menu_idx = 0;
filebrowser_t *filebrowser = &tmpBrowser;
filebrowser_t *filebrowser = tmpBrowser;
rmenu_default_positions_t default_pos;
device_ptr->ctx_driver->rmenu_set_default_pos(&default_pos);
@ -2369,17 +2369,20 @@ void init_filebrowser(void *data)
{
(void)data;
browser = filebrowser_init(default_paths.filebrowser_startup_dir, rarch_console_get_rom_ext());
tmpBrowser = filebrowser_init(default_paths.filesystem_root_dir, "");
menu_stack_push(FILE_BROWSER_MENU);
filebrowser_set_root_and_ext(&browser, rarch_console_get_rom_ext(), default_paths.filebrowser_startup_dir);
filebrowser_set_root(&tmpBrowser, default_paths.filesystem_root_dir);
filebrowser_set_root_and_ext(browser, rarch_console_get_rom_ext(), default_paths.filebrowser_startup_dir);
filebrowser_set_root(tmpBrowser, default_paths.filesystem_root_dir);
}
void free_filebrowser(void *data)
{
(void)data;
filebrowser_free(&browser);
filebrowser_free(&tmpBrowser);
filebrowser_free(browser);
filebrowser_free(tmpBrowser);
}
/*============================================================