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

(PS3) Move filebrowser menu stack push to menu_init so it isn't

Browse Source 
being done everytime we go back from ingame to menu
This commit is contained in:
Twinaphex 2012-06-29 11:56:58 +02:00
parent 62925dcda1
commit 1d2f7634d7
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ps3/frontend/menu.c
View File

@ -518,6 +518,9 @@ static void menu_stack_push(unsigned stack_idx, unsigned menu_id)
menuStack[stack_idx].page = 0; menuStack[stack_idx].page = 0;
menuStack[stack_idx].category_id = CATEGORY_FILEBROWSER; menuStack[stack_idx].category_id = CATEGORY_FILEBROWSER;
menu_stack_refresh(stack_idx); menu_stack_refresh(stack_idx);
strlcpy(browser.extensions, rarch_console_get_rom_ext(), sizeof(browser.extensions));
filebrowser_set_root(&browser, "/");
filebrowser_iterate(&browser, FILEBROWSER_ACTION_RESET);
break; break;
case LIBRETRO_CHOICE: case LIBRETRO_CHOICE:
strlcpy(menuStack[stack_idx].title, "FILE BROWSER |", sizeof(menuStack[stack_idx].title)); strlcpy(menuStack[stack_idx].title, "FILE BROWSER |", sizeof(menuStack[stack_idx].title));
@ -663,7 +666,6 @@ static void menu_stack_push(unsigned stack_idx, unsigned menu_id)
} }
} }
//forward decls //forward decls
extern const char *ps3_get_resolution_label(unsigned resolution); extern const char *ps3_get_resolution_label(unsigned resolution);
@ -1154,19 +1156,15 @@ static void producesettingentry(menu * menu_obj, uint64_t switchvalue)
if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_CROSS(trigger_state)) if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_CROSS(trigger_state))
{ {
if(g_console.menu_font_size > 0) if(g_console.menu_font_size > 0)
{ g_console.menu_font_size -= 0.01f;
g_console.menu_font_size -= 0.01f;
}
} }
if(CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) if(CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state))
{ {
if((g_console.menu_font_size < 2.0f)) if((g_console.menu_font_size < 2.0f))
{ g_console.menu_font_size += 0.01f;
g_console.menu_font_size += 0.01f;
}
} }
if(CTRL_START(trigger_state)) if(CTRL_START(trigger_state))
g_console.menu_font_size = 1.0f; g_console.menu_font_size = 1.0f;
break; break;
case SETTING_KEEP_ASPECT_RATIO: case SETTING_KEEP_ASPECT_RATIO:
if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state)) if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state))
@ -2216,10 +2214,8 @@ static void ingame_menu(void)
void menu_init (void) void menu_init (void)
{ {
filebrowser_set_root(&browser, "/"); menu_stack_push(0, FILE_BROWSER_MENU);
filebrowser_set_root(&tmpBrowser, "/"); filebrowser_set_root(&tmpBrowser, "/");
strlcpy(browser.extensions, rarch_console_get_rom_ext(), sizeof(browser.extensions));
filebrowser_iterate(&browser, FILEBROWSER_ACTION_RESET);
} }
void menu_free (void) void menu_free (void)
@ -2250,11 +2246,7 @@ void menu_loop(void)
{ {
gl_t * gl = driver.video_data; gl_t * gl = driver.video_data;
menu_stack_push(0, FILE_BROWSER_MENU);
g_console.menu_enable = true; g_console.menu_enable = true;
gl->block_swap = true; gl->block_swap = true;
if(g_console.ingame_menu_enable) if(g_console.ingame_menu_enable)