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

(RARCH_CONSOLE) Remove flow control state functions in rarch_settings_change

This commit is contained in:
twinaphex 2013-01-11 02:11:50 +01:00
parent 9bc24151f2
commit d324b21949
6 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
console/rarch_console_settings.c
View File

@ -86,16 +86,6 @@ void rarch_settings_change(unsigned setting)
g_extern.console.screen.resolutions.current.id = g_extern.console.screen.resolutions.list[g_extern.console.screen.resolutions.current.idx]; g_extern.console.screen.resolutions.current.id = g_extern.console.screen.resolutions.list[g_extern.console.screen.resolutions.current.idx];
} }
break; break;
case S_RETURN_TO_GAME:
g_extern.lifecycle_menu_state = (1 << MODE_EMULATION);
break;
case S_RETURN_TO_LAUNCHER:
g_extern.console.external_launch.enable = true;
g_extern.lifecycle_menu_state = (1 << MODE_EXIT);
break;
case S_RETURN_TO_MENU:
g_extern.lifecycle_menu_state = (1 << MODE_MENU);
break;
case S_ROTATION_DECREMENT: case S_ROTATION_DECREMENT:
if(g_extern.console.screen.orientation > 0) if(g_extern.console.screen.orientation > 0)
g_extern.console.screen.orientation--; g_extern.console.screen.orientation--;
@ -104,9 +94,6 @@ void rarch_settings_change(unsigned setting)
if(g_extern.console.screen.orientation < LAST_ORIENTATION) if(g_extern.console.screen.orientation < LAST_ORIENTATION)
g_extern.console.screen.orientation++; g_extern.console.screen.orientation++;
break; break;
case S_START_RARCH:
g_extern.lifecycle_menu_state = (1 << MODE_INIT);
break;
case S_REWIND: case S_REWIND:
g_settings.rewind_enable = !g_settings.rewind_enable; g_settings.rewind_enable = !g_settings.rewind_enable;
break; break;

4
console/rarch_console_settings.h
View File

@ -41,9 +41,6 @@ enum
S_OVERSCAN_INCREMENT, S_OVERSCAN_INCREMENT,
S_RESOLUTION_PREVIOUS, S_RESOLUTION_PREVIOUS,
S_RESOLUTION_NEXT, S_RESOLUTION_NEXT,
S_RETURN_TO_GAME,
S_RETURN_TO_LAUNCHER,
S_RETURN_TO_MENU,
S_ROTATION_DECREMENT, S_ROTATION_DECREMENT,
S_ROTATION_INCREMENT, S_ROTATION_INCREMENT,
S_REWIND, S_REWIND,
@ -52,7 +49,6 @@ enum
S_SCALE_ENABLED, S_SCALE_ENABLED,
S_SCALE_FACTOR_DECREMENT, S_SCALE_FACTOR_DECREMENT,
S_SCALE_FACTOR_INCREMENT, S_SCALE_FACTOR_INCREMENT,
S_START_RARCH,
S_THROTTLE, S_THROTTLE,
S_TRIPLE_BUFFERING S_TRIPLE_BUFFERING
}; };

7
frontend/menu/rgui.c
View File

@ -581,7 +581,7 @@ static void rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
rarch_save_state(); rarch_save_state();
else else
rarch_load_state(); rarch_load_state();
rarch_settings_change(S_RETURN_TO_GAME); g_extern.lifecycle_menu_state = (1 << MODE_EMULATION);
} }
else if (action == RGUI_ACTION_START) else if (action == RGUI_ACTION_START)
rarch_settings_default(S_DEF_SAVE_STATE); rarch_settings_default(S_DEF_SAVE_STATE);
@ -610,7 +610,7 @@ static void rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
case RGUI_SETTINGS_RESTART_GAME: case RGUI_SETTINGS_RESTART_GAME:
if (action == RGUI_ACTION_OK) if (action == RGUI_ACTION_OK)
{ {
rarch_settings_change(S_RETURN_TO_GAME); g_extern.lifecycle_menu_state = (1 << MODE_EMULATION);
rarch_game_reset(); rarch_game_reset();
} }
break; break;
@ -760,7 +760,8 @@ static void rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
#ifdef GEKKO #ifdef GEKKO
snprintf(g_extern.console.external_launch.launch_app, sizeof(g_extern.console.external_launch.launch_app), "%s/boot.dol", default_paths.core_dir); snprintf(g_extern.console.external_launch.launch_app, sizeof(g_extern.console.external_launch.launch_app), "%s/boot.dol", default_paths.core_dir);
#endif #endif
rarch_settings_change(S_RETURN_TO_LAUNCHER); g_extern.console.external_launch.enable = true;
g_extern.lifecycle_menu_state = (1 << MODE_EXIT);
} }
break; break;
case RGUI_SETTINGS_QUIT_EMULATOR: case RGUI_SETTINGS_QUIT_EMULATOR:

20
frontend/menu/rmenu.c
View File

@ -718,7 +718,8 @@ int select_file(void *data, void *state)
{ {
strlcpy(g_extern.console.external_launch.launch_app, path, sizeof(g_extern.console.external_launch.launch_app)); strlcpy(g_extern.console.external_launch.launch_app, path, sizeof(g_extern.console.external_launch.launch_app));
set_libretro_core_as_launch = false; set_libretro_core_as_launch = false;
rarch_settings_change(S_RETURN_TO_LAUNCHER); g_extern.console.external_launch.enable = true;
g_extern.lifecycle_menu_state = (1 << MODE_EXIT);
} }
else else
{ {
@ -2074,7 +2075,7 @@ int ingame_menu(void *data, void *state)
menuitem_colors[menu_idx] = RED; menuitem_colors[menu_idx] = RED;
if(input & (1ULL << RMENU_DEVICE_NAV_A)) if(input & (1ULL << RMENU_DEVICE_NAV_A))
rarch_settings_change(S_RETURN_TO_GAME); g_extern.lifecycle_menu_state = (1 << MODE_EMULATION);
switch(menu_idx) switch(menu_idx)
{ {
@ -2082,7 +2083,7 @@ int ingame_menu(void *data, void *state)
if(input & (1ULL << RMENU_DEVICE_NAV_B)) if(input & (1ULL << RMENU_DEVICE_NAV_B))
{ {
rarch_load_state(); rarch_load_state();
rarch_settings_change(S_RETURN_TO_GAME); g_extern.lifecycle_menu_state = (1 << MODE_EMULATION);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_LEFT)) if(input & (1ULL << RMENU_DEVICE_NAV_LEFT))
rarch_state_slot_decrease(); rarch_state_slot_decrease();
@ -2095,7 +2096,7 @@ int ingame_menu(void *data, void *state)
if(input & (1ULL << RMENU_DEVICE_NAV_B)) if(input & (1ULL << RMENU_DEVICE_NAV_B))
{ {
rarch_save_state(); rarch_save_state();
rarch_settings_change(S_RETURN_TO_GAME); g_extern.lifecycle_menu_state = (1 << MODE_EMULATION);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_LEFT)) if(input & (1ULL << RMENU_DEVICE_NAV_LEFT))
@ -2160,22 +2161,22 @@ int ingame_menu(void *data, void *state)
break; break;
case MENU_ITEM_RETURN_TO_GAME: case MENU_ITEM_RETURN_TO_GAME:
if(input & (1ULL << RMENU_DEVICE_NAV_B)) if(input & (1ULL << RMENU_DEVICE_NAV_B))
rarch_settings_change(S_RETURN_TO_GAME); g_extern.lifecycle_menu_state = (1 << MODE_EMULATION);
snprintf(strw_buffer, sizeof(strw_buffer), "Press [%s] to return to the game.", rarch_input_find_platform_key_label(1ULL << RETRO_DEVICE_ID_JOYPAD_B)); snprintf(strw_buffer, sizeof(strw_buffer), "Press [%s] to return to the game.", rarch_input_find_platform_key_label(1ULL << RETRO_DEVICE_ID_JOYPAD_B));
break; break;
case MENU_ITEM_RESET: case MENU_ITEM_RESET:
if(input & (1ULL << RMENU_DEVICE_NAV_B)) if(input & (1ULL << RMENU_DEVICE_NAV_B))
{ {
rarch_settings_change(S_RETURN_TO_GAME);
rarch_game_reset(); rarch_game_reset();
g_extern.lifecycle_menu_state = (1 << MODE_EMULATION);
} }
snprintf(strw_buffer, sizeof(strw_buffer), "Press [%s] to reset the game.", rarch_input_find_platform_key_label(1ULL << RETRO_DEVICE_ID_JOYPAD_B)); snprintf(strw_buffer, sizeof(strw_buffer), "Press [%s] to reset the game.", rarch_input_find_platform_key_label(1ULL << RETRO_DEVICE_ID_JOYPAD_B));
break; break;
case MENU_ITEM_RETURN_TO_MENU: case MENU_ITEM_RETURN_TO_MENU:
if(input & (1ULL << RMENU_DEVICE_NAV_B)) if(input & (1ULL << RMENU_DEVICE_NAV_B))
{ {
rarch_settings_change(S_RETURN_TO_MENU); g_extern.lifecycle_menu_state = (1 << MODE_MENU);
menu_idx = 0; menu_idx = 0;
} }
snprintf(strw_buffer, sizeof(strw_buffer), "Press [%s] to return to the ROM Browser.", rarch_input_find_platform_key_label(1ULL << RETRO_DEVICE_ID_JOYPAD_B)); snprintf(strw_buffer, sizeof(strw_buffer), "Press [%s] to return to the ROM Browser.", rarch_input_find_platform_key_label(1ULL << RETRO_DEVICE_ID_JOYPAD_B));
@ -2196,7 +2197,8 @@ int ingame_menu(void *data, void *state)
RARCH_LOG("Boot Multiman: %s.\n", default_paths.multiman_self_file); RARCH_LOG("Boot Multiman: %s.\n", default_paths.multiman_self_file);
strlcpy(g_extern.console.external_launch.launch_app, default_paths.multiman_self_file, strlcpy(g_extern.console.external_launch.launch_app, default_paths.multiman_self_file,
sizeof(g_extern.console.external_launch.launch_app)); sizeof(g_extern.console.external_launch.launch_app));
rarch_settings_change(S_RETURN_TO_LAUNCHER); g_extern.console.external_launch.enable = true;
g_extern.lifecycle_menu_state = (1 << MODE_EXIT);
} }
snprintf(strw_buffer, sizeof(strw_buffer), "Press [%s] to quit RetroArch and return to multiMAN.", rarch_input_find_platform_key_label(1ULL << RETRO_DEVICE_ID_JOYPAD_B)); snprintf(strw_buffer, sizeof(strw_buffer), "Press [%s] to quit RetroArch and return to multiMAN.", rarch_input_find_platform_key_label(1ULL << RETRO_DEVICE_ID_JOYPAD_B));
break; break;
@ -2229,7 +2231,7 @@ int ingame_menu(void *data, void *state)
} }
if((input & (1ULL << RMENU_DEVICE_NAV_L3)) && (input & (1ULL << RMENU_DEVICE_NAV_R3))) if((input & (1ULL << RMENU_DEVICE_NAV_L3)) && (input & (1ULL << RMENU_DEVICE_NAV_R3)))
rarch_settings_change(S_RETURN_TO_GAME); g_extern.lifecycle_menu_state = (1 << MODE_EMULATION);
display_menubar(current_menu); display_menubar(current_menu);

11
frontend/menu/rmenu_xui.cpp
View File

@ -781,14 +781,14 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
if (g_extern.main_is_init) if (g_extern.main_is_init)
{ {
rarch_load_state(); rarch_load_state();
rarch_settings_change(S_RETURN_TO_GAME); g_extern.lifecycle_menu_state = (1 << MODE_EMULATION);
} }
break; break;
case MENU_ITEM_SAVE_STATE: case MENU_ITEM_SAVE_STATE:
if (g_extern.main_is_init) if (g_extern.main_is_init)
{ {
rarch_save_state(); rarch_save_state();
rarch_settings_change(S_RETURN_TO_GAME); g_extern.lifecycle_menu_state = (1 << MODE_EMULATION);
} }
break; break;
case MENU_ITEM_KEEP_ASPECT_RATIO: case MENU_ITEM_KEEP_ASPECT_RATIO:
@ -827,13 +827,13 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
case MENU_ITEM_RESET: case MENU_ITEM_RESET:
if (g_extern.main_is_init) if (g_extern.main_is_init)
{ {
rarch_settings_change(S_RETURN_TO_GAME);
rarch_game_reset(); rarch_game_reset();
g_extern.lifecycle_menu_state = (1 << MODE_EMULATION);
} }
break; break;
case MENU_ITEM_RETURN_TO_GAME: case MENU_ITEM_RETURN_TO_GAME:
if (g_extern.main_is_init) if (g_extern.main_is_init)
rarch_settings_change(S_RETURN_TO_GAME); g_extern.lifecycle_menu_state = (1 << MODE_EMULATION);
break; break;
case MENU_ITEM_QUIT_RARCH: case MENU_ITEM_QUIT_RARCH:
g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION)); g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION));
@ -938,7 +938,8 @@ HRESULT CRetroArchCoreBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle
if(path_file_exists(tmp_browser->current_dir.list->elems[index].data)) if(path_file_exists(tmp_browser->current_dir.list->elems[index].data))
{ {
snprintf(g_extern.console.external_launch.launch_app, sizeof(g_extern.console.external_launch.launch_app), "%s\\%s", filebrowser_get_current_dir(tmp_browser), str_buffer); snprintf(g_extern.console.external_launch.launch_app, sizeof(g_extern.console.external_launch.launch_app), "%s\\%s", filebrowser_get_current_dir(tmp_browser), str_buffer);
rarch_settings_change(S_RETURN_TO_LAUNCHER); g_extern.console.external_launch.enable = true;
g_extern.lifecycle_menu_state = (1 << MODE_EXIT);
} }
else if(tmp_browser->current_dir.list->elems[index].attr.b) else if(tmp_browser->current_dir.list->elems[index].attr.b)
{ {

2
frontend/platform/platform_ps3.c
View File

@ -394,7 +394,7 @@ static void system_process_args(int argc, char *argv[])
case EXTERN_LAUNCHER_MULTIMAN: case EXTERN_LAUNCHER_MULTIMAN:
RARCH_LOG("Started from multiMAN, will auto-start game.\n"); RARCH_LOG("Started from multiMAN, will auto-start game.\n");
strlcpy(g_extern.fullpath, argv[1], sizeof(g_extern.fullpath)); strlcpy(g_extern.fullpath, argv[1], sizeof(g_extern.fullpath));
rarch_settings_change(S_START_RARCH); g_extern.lifecycle_menu_state = (1 << MODE_INIT);
break; break;
#endif #endif
default: default: