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

Rename FRONTEND_FORK_SALAMANDER_RESTART to FRONTEND_FORK_RESTART 

and call FRONTEND_FORK_CORE instead of FRONTEND_FORK_RESTART
when selecting a core from 'Load Core' list
This commit is contained in:
twinaphex 2016-02-05 18:57:44 +01:00
parent 6a64ab1137
commit 8c2ed9f750
8 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command_event.c
View File

@ -1376,7 +1376,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL); rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
break; break;
case EVENT_CMD_RESTART_RETROARCH: case EVENT_CMD_RESTART_RETROARCH:
if (!frontend_driver_set_fork(FRONTEND_FORK_SALAMANDER_RESTART)) if (!frontend_driver_set_fork(FRONTEND_FORK_RESTART))
return false; return false;
break; break;
case EVENT_CMD_MENU_SAVE_CURRENT_CONFIG: case EVENT_CMD_MENU_SAVE_CURRENT_CONFIG:

14
frontend/drivers/platform_gx.c
View File

@ -340,7 +340,7 @@ static void frontend_gx_exitspawn(char *s, size_t len)
case FRONTEND_FORK_CORE_WITH_ARGS: case FRONTEND_FORK_CORE_WITH_ARGS:
should_load_game = true; should_load_game = true;
break; break;
case FRONTEND_FORK_SALAMANDER_RESTART: case FRONTEND_FORK_RESTART:
{ {
char new_path[PATH_MAX_LENGTH]; char new_path[PATH_MAX_LENGTH];
char salamander_name[PATH_MAX_LENGTH]; char salamander_name[PATH_MAX_LENGTH];
@ -402,17 +402,17 @@ static bool frontend_gx_set_fork(enum frontend_fork fork_mode)
{ {
case FRONTEND_FORK_CORE: case FRONTEND_FORK_CORE:
RARCH_LOG("FRONTEND_FORK_CORE\n"); RARCH_LOG("FRONTEND_FORK_CORE\n");
gx_fork_mode = fork_mode; /* NOTE: We implement Salamander, so just turn
* this into FRONTEND_FORK_RESTART. */
gx_fork_mode = FRONTEND_FORK_RESTART;
break; break;
case FRONTEND_FORK_CORE_WITH_ARGS: case FRONTEND_FORK_CORE_WITH_ARGS:
RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n"); RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
gx_fork_mode = fork_mode; gx_fork_mode = fork_mode;
break; break;
case FRONTEND_FORK_SALAMANDER_RESTART: case FRONTEND_FORK_RESTART:
RARCH_LOG("FRONTEND_FORK_SALAMANDER_RESTART\n"); RARCH_LOG("FRONTEND_FORK_RESTART\n");
/* NOTE: We don't implement Salamander, so just turn gx_fork_mode = fork_mode;
* this into FRONTEND_FORK_CORE. */
gx_fork_mode = FRONTEND_FORK_CORE;
break; break;
case FRONTEND_FORK_NONE: case FRONTEND_FORK_NONE:
default: default:

4
frontend/drivers/platform_linux.c
View File

@ -2157,8 +2157,8 @@ static bool frontend_linux_set_fork(enum frontend_fork fork_mode)
RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n"); RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
linux_fork_mode = fork_mode; linux_fork_mode = fork_mode;
break; break;
case FRONTEND_FORK_SALAMANDER_RESTART: case FRONTEND_FORK_RESTART:
RARCH_LOG("FRONTEND_FORK_SALAMANDER_RESTART\n"); RARCH_LOG("FRONTEND_FORK_RESTART\n");
/* NOTE: We don't implement Salamander, so just turn /* NOTE: We don't implement Salamander, so just turn
* this into FRONTEND_FORK_CORE. */ * this into FRONTEND_FORK_CORE. */
linux_fork_mode = FRONTEND_FORK_CORE; linux_fork_mode = FRONTEND_FORK_CORE;

4
frontend/drivers/platform_ps3.c
View File

@ -339,8 +339,8 @@ static bool frontend_ps3_set_fork(enum frontend_fork fork_mode)
RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n"); RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
ps3_fork_mode = fork_mode; ps3_fork_mode = fork_mode;
break; break;
case FRONTEND_FORK_SALAMANDER_RESTART: case FRONTEND_FORK_RESTART:
RARCH_LOG("FRONTEND_FORK_SALAMANDER_RESTART\n"); RARCH_LOG("FRONTEND_FORK_RESTART\n");
/* NOTE: We don't implement Salamander, so just turn /* NOTE: We don't implement Salamander, so just turn
* this into FRONTEND_FORK_CORE. */ * this into FRONTEND_FORK_CORE. */
ps3_fork_mode = FRONTEND_FORK_CORE; ps3_fork_mode = FRONTEND_FORK_CORE;

4
frontend/drivers/platform_psp.c
View File

@ -281,8 +281,8 @@ static bool frontend_psp_set_fork(enum frontend_fork fork_mode)
RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n"); RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
psp_fork_mode = fork_mode; psp_fork_mode = fork_mode;
break; break;
case FRONTEND_FORK_SALAMANDER_RESTART: case FRONTEND_FORK_RESTART:
RARCH_LOG("FRONTEND_FORK_SALAMANDER_RESTART\n"); RARCH_LOG("FRONTEND_FORK_RESTART\n");
/* NOTE: We don't implement Salamander, so just turn /* NOTE: We don't implement Salamander, so just turn
* this into FRONTEND_FORK_CORE. */ * this into FRONTEND_FORK_CORE. */
psp_fork_mode = FRONTEND_FORK_CORE; psp_fork_mode = FRONTEND_FORK_CORE;

2
frontend/drivers/platform_xdk.cpp
View File

@ -1304,7 +1304,7 @@ static bool frontend_xdk_set_fork(enum frontend_fork fork_mode)
RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n"); RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
xdk_fork_mode = fork_mode; xdk_fork_mode = fork_mode;
break; break;
case FRONTEND_FORK_SALAMANDER_RESTART: case FRONTEND_FORK_RESTART:
RARCH_LOG("FRONTEND_FORK_SALAMANDER_RESTART\n"); RARCH_LOG("FRONTEND_FORK_SALAMANDER_RESTART\n");
/* NOTE: We don't implement Salamander, so just turn /* NOTE: We don't implement Salamander, so just turn
* this into FRONTEND_FORK_CORE. */ * this into FRONTEND_FORK_CORE. */

2
frontend/frontend_driver.h
View File

@ -45,7 +45,7 @@ enum frontend_fork
FRONTEND_FORK_NONE = 0, FRONTEND_FORK_NONE = 0,
FRONTEND_FORK_CORE, FRONTEND_FORK_CORE,
FRONTEND_FORK_CORE_WITH_ARGS, FRONTEND_FORK_CORE_WITH_ARGS,
FRONTEND_FORK_SALAMANDER_RESTART FRONTEND_FORK_RESTART
}; };
enum frontend_architecture enum frontend_architecture

4
menu/cbs/menu_cbs_ok.c
View File

@ -768,9 +768,7 @@ static int generic_action_ok(const char *path,
if (event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL)) if (event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL))
{ {
#ifndef HAVE_DYNAMIC #ifndef HAVE_DYNAMIC
/* Core selection on non-console just updates directory listing. if (frontend_driver_set_fork(FRONTEND_FORK_CORE))
* Will take effect on new content load. */
if (event_cmd_ctl(EVENT_CMD_RESTART_RETROARCH, NULL))
ret = -1; ret = -1;
#endif #endif
} }