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

(PS3) Multiman cleanups

This commit is contained in:
twinaphex 2013-03-23 05:17:39 +01:00
parent c29da41501
commit 82d80cf24f
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
console/rarch_console.h
View File

@ -36,9 +36,6 @@ typedef struct
char filesystem_root_dir[MAXIMUM_PATH]; char filesystem_root_dir[MAXIMUM_PATH];
char input_presets_dir[MAXIMUM_PATH]; char input_presets_dir[MAXIMUM_PATH];
char screenshots_dir[MAXIMUM_PATH]; char screenshots_dir[MAXIMUM_PATH];
#ifdef HAVE_MULTIMAN
char multiman_self_file[MAXIMUM_PATH];
#endif
char port_dir[MAXIMUM_PATH]; char port_dir[MAXIMUM_PATH];
char savestate_dir[MAXIMUM_PATH]; char savestate_dir[MAXIMUM_PATH];
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)

3
frontend/menu/rmenu.c
View File

@ -3025,12 +3025,11 @@ int ingame_menu(void *data, void *state)
case MENU_ITEM_RETURN_TO_MULTIMAN: case MENU_ITEM_RETURN_TO_MULTIMAN:
if(input & (1ULL << RMENU_DEVICE_NAV_B)) if(input & (1ULL << RMENU_DEVICE_NAV_B))
{ {
RARCH_LOG("Boot Multiman: %s.\n", default_paths.multiman_self_file);
strlcpy(g_extern.fullpath, default_paths.multiman_self_file, sizeof(g_extern.fullpath));
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME);
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT);
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXITSPAWN); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXITSPAWN);
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXITSPAWN_MULTIMAN);
return -1; return -1;
} }
strlcpy(strw_buffer, "Quit RetroArch and return to multiMAN.", sizeof(strw_buffer)); strlcpy(strw_buffer, "Quit RetroArch and return to multiMAN.", sizeof(strw_buffer));

16
frontend/platform/platform_ps3.c
View File

@ -40,6 +40,10 @@ SYS_PROCESS_PARAM(1001, 0x100000)
SYS_PROCESS_PARAM(1001, 0x200000) SYS_PROCESS_PARAM(1001, 0x200000)
#endif #endif
#ifdef HAVE_MULTIMAN
#define MULTIMAN_SELF_FILE "/dev_hdd0/game/BLES80608/USRDIR/RELOAD.SELF"
#endif
#ifdef IS_SALAMANDER #ifdef IS_SALAMANDER
#include <netex/net.h> #include <netex/net.h>
#include <np.h> #include <np.h>
@ -216,10 +220,7 @@ static void get_environment_settings(int argc, char *argv[])
#ifdef HAVE_MULTIMAN #ifdef HAVE_MULTIMAN
/* not launched from external launcher, set default path */ /* not launched from external launcher, set default path */
strlcpy(default_paths.multiman_self_file, "/dev_hdd0/game/BLES80608/USRDIR/RELOAD.SELF", if(path_file_exists(MULTIMAN_SELF_FILE) && argc > 1 && path_file_exists(argv[1]))
sizeof(default_paths.multiman_self_file));
if(path_file_exists(default_paths.multiman_self_file) && argc > 1 && path_file_exists(argv[1]))
{ {
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXTLAUNCH_MULTIMAN); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXTLAUNCH_MULTIMAN);
RARCH_LOG("Started from multiMAN, auto-game start enabled.\n"); RARCH_LOG("Started from multiMAN, auto-game start enabled.\n");
@ -438,6 +439,13 @@ static void system_deinit_save(void)
static void system_exitspawn(void) static void system_exitspawn(void)
{ {
#ifdef HAVE_RARCH_EXEC #ifdef HAVE_RARCH_EXEC
#ifdef HAVE_MULTIMAN
if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXITSPAWN_MULTIMAN))
{
RARCH_LOG("Boot Multiman: %s.\n", MULTIMAN_SELF_FILE);
strlcpy(g_extern.fullpath, MULTIMAN_SELF_FILE, sizeof(g_extern.fullpath));
}
#endif
#ifdef IS_SALAMANDER #ifdef IS_SALAMANDER
rarch_console_exec(default_paths.libretro_path); rarch_console_exec(default_paths.libretro_path);

3
general.h
View File

@ -126,9 +126,8 @@ enum menu_enums
MODE_EXTLAUNCH_MULTIMAN, MODE_EXTLAUNCH_MULTIMAN,
MODE_EXIT, MODE_EXIT,
MODE_EXITSPAWN, MODE_EXITSPAWN,
#ifdef ANDROID MODE_EXITSPAWN_MULTIMAN,
MODE_INPUT_XPERIA_PLAY_HACK, MODE_INPUT_XPERIA_PLAY_HACK,
#endif
MODE_VIDEO_TRIPLE_BUFFERING_ENABLE, MODE_VIDEO_TRIPLE_BUFFERING_ENABLE,
MODE_VIDEO_FLICKER_FILTER_ENABLE, MODE_VIDEO_FLICKER_FILTER_ENABLE,
MODE_VIDEO_SOFT_FILTER_ENABLE, MODE_VIDEO_SOFT_FILTER_ENABLE,