mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RMenu) Take out _XBOX1-specific defines - make it more generic

Browse Source
This commit is contained in:
twinaphex 2012-08-05 04:43:21 +02:00
parent bbe0555185
commit 2affce8829
2 changed files with 9 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
console/rmenu/rmenu.c
View File

@ -700,12 +700,7 @@ static void browser_update(filebrowser_t * b, uint64_t input, const char *extens
else if (input & (1 << RETRO_DEVICE_ID_JOYPAD_START)) else if (input & (1 << RETRO_DEVICE_ID_JOYPAD_START))
{ {
action = FILEBROWSER_ACTION_RESET; action = FILEBROWSER_ACTION_RESET;
//TODO - Dehardcode this filebrowser_set_root(b, default_paths.filesystem_root_dir);
#ifdef _XBOX1
filebrowser_set_root(b, "D:");
#else
filebrowser_set_root(b, "/");
#endif
strlcpy(b->extensions, extensions, sizeof(b->extensions)); strlcpy(b->extensions, extensions, sizeof(b->extensions));
} }
@ -1484,29 +1479,17 @@ static void producesettingentry(menu *current_menu, item *items, unsigned switch
if((input & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_B))) if((input & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_B)))
{ {
menu_stack_push(items, PATH_DEFAULT_ROM_DIR_CHOICE); menu_stack_push(items, PATH_DEFAULT_ROM_DIR_CHOICE);
#ifdef _XBOX1 filebrowser_set_root_and_ext(&tmpBrowser, "empty", default_paths.filesystem_root_dir);
filebrowser_set_root_and_ext(&tmpBrowser, "empty", "D:");
#else
filebrowser_set_root_and_ext(&tmpBrowser, "empty", "/");
#endif
} }
if(input & (1 << RETRO_DEVICE_ID_JOYPAD_START)) if(input & (1 << RETRO_DEVICE_ID_JOYPAD_START))
#ifdef _XBOX1 strlcpy(g_console.default_rom_startup_dir, default_paths.filesystem_root_dir, sizeof(g_console.default_rom_startup_dir));
strlcpy(g_console.default_rom_startup_dir, "D:", sizeof(g_console.default_rom_startup_dir));
#else
strlcpy(g_console.default_rom_startup_dir, "/", sizeof(g_console.default_rom_startup_dir));
#endif
break; break;
case SETTING_PATH_SAVESTATES_DIRECTORY: case SETTING_PATH_SAVESTATES_DIRECTORY:
if((input & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_B))) if((input & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_B)))
{ {
menu_stack_push(items, PATH_SAVESTATES_DIR_CHOICE); menu_stack_push(items, PATH_SAVESTATES_DIR_CHOICE);
#ifdef _XBOX1 filebrowser_set_root_and_ext(&tmpBrowser, "empty", default_paths.filesystem_root_dir);
filebrowser_set_root_and_ext(&tmpBrowser, "empty", "D:");
#else
filebrowser_set_root_and_ext(&tmpBrowser, "empty", "/");
#endif
} }
if(input & (1 << RETRO_DEVICE_ID_JOYPAD_START)) if(input & (1 << RETRO_DEVICE_ID_JOYPAD_START))
@ -1517,11 +1500,7 @@ static void producesettingentry(menu *current_menu, item *items, unsigned switch
if((input & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_B))) if((input & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_B)))
{ {
menu_stack_push(items, PATH_SRAM_DIR_CHOICE); menu_stack_push(items, PATH_SRAM_DIR_CHOICE);
#ifdef _XBOX1 filebrowser_set_root_and_ext(&tmpBrowser, "empty", default_paths.filesystem_root_dir);
filebrowser_set_root_and_ext(&tmpBrowser, "empty", "D:");
#else
filebrowser_set_root_and_ext(&tmpBrowser, "empty", "/");
#endif
} }
if(input & (1 << RETRO_DEVICE_ID_JOYPAD_START)) if(input & (1 << RETRO_DEVICE_ID_JOYPAD_START))
@ -1532,11 +1511,7 @@ static void producesettingentry(menu *current_menu, item *items, unsigned switch
if((input & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_B))) if((input & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_B)))
{ {
menu_stack_push(items, PATH_CHEATS_DIR_CHOICE); menu_stack_push(items, PATH_CHEATS_DIR_CHOICE);
#ifdef _XBOX1 filebrowser_set_root_and_ext(&tmpBrowser, "empty", default_paths.filesystem_root_dir);
filebrowser_set_root_and_ext(&tmpBrowser, "empty", "D:");
#else
filebrowser_set_root_and_ext(&tmpBrowser, "empty", "/");
#endif
} }
if(input & (1 << RETRO_DEVICE_ID_JOYPAD_START)) if(input & (1 << RETRO_DEVICE_ID_JOYPAD_START))
@ -1547,11 +1522,7 @@ static void producesettingentry(menu *current_menu, item *items, unsigned switch
if((input & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_B))) if((input & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input & (1 << RETRO_DEVICE_ID_JOYPAD_B)))
{ {
menu_stack_push(items, PATH_SYSTEM_DIR_CHOICE); menu_stack_push(items, PATH_SYSTEM_DIR_CHOICE);
#ifdef _XBOX1 filebrowser_set_root_and_ext(&tmpBrowser, "empty", default_paths.filesystem_root_dir);
filebrowser_set_root_and_ext(&tmpBrowser, "empty", "D:");
#else
filebrowser_set_root_and_ext(&tmpBrowser, "empty", "/");
#endif
} }
if(input & (1 << RETRO_DEVICE_ID_JOYPAD_START)) if(input & (1 << RETRO_DEVICE_ID_JOYPAD_START))
@ -2244,11 +2215,7 @@ void menu_init (void)
menu_stack_push(rmenu_items, FILE_BROWSER_MENU); menu_stack_push(rmenu_items, FILE_BROWSER_MENU);
filebrowser_set_root_and_ext(&browser, rarch_console_get_rom_ext(), default_paths.filebrowser_startup_dir); filebrowser_set_root_and_ext(&browser, rarch_console_get_rom_ext(), default_paths.filebrowser_startup_dir);
#ifdef _XBOX1 filebrowser_set_root(&tmpBrowser, default_paths.filesystem_root_dir);
filebrowser_set_root(&tmpBrowser, "D:");
#else
filebrowser_set_root(&tmpBrowser, "/");
#endif
#ifdef _XBOX1 #ifdef _XBOX1
// Set file cache size // Set file cache size

3
xdk/frontend/main.c
View File

@ -105,10 +105,9 @@ static void get_environment_settings (void)
#endif #endif
#if defined(_XBOX1) #if defined(_XBOX1)
/* FIXME: Hardcoded */
strlcpy(default_paths.core_dir, "D:", sizeof(default_paths.core_dir)); strlcpy(default_paths.core_dir, "D:", sizeof(default_paths.core_dir));
strlcpy(default_paths.config_file, "D:\\retroarch.cfg", sizeof(default_paths.config_file)); strlcpy(default_paths.config_file, "D:\\retroarch.cfg", sizeof(default_paths.config_file));
strlcpy(default_paths.system_dir, "D:\\system\\", sizeof(default_paths.system_dir)); strlcpy(default_paths.system_dir, "D:\\system", sizeof(default_paths.system_dir));
strlcpy(default_paths.filesystem_root_dir, "D:", sizeof(default_paths.filesystem_root_dir)); strlcpy(default_paths.filesystem_root_dir, "D:", sizeof(default_paths.filesystem_root_dir));
strlcpy(default_paths.executable_extension, ".xbe", sizeof(default_paths.executable_extension)); strlcpy(default_paths.executable_extension, ".xbe", sizeof(default_paths.executable_extension));
strlcpy(default_paths.filebrowser_startup_dir, "D:", sizeof(default_paths.filebrowser_startup_dir)); strlcpy(default_paths.filebrowser_startup_dir, "D:", sizeof(default_paths.filebrowser_startup_dir));