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

(RARCH_CONSOLE) Don't need rarch_settings_change anymore for

Browse Source 
exiting
This commit is contained in:
twinaphex 2013-01-10 22:42:12 +01:00
parent b5e82dae59
commit 7ebbafe8e1
6 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
console/rarch_console_settings.c
View File

@ -86,13 +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_QUIT:
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_INGAME);
g_extern.lifecycle_menu_state = (1 << MODE_EXIT);
break;
case S_QUIT_RARCH:
g_extern.lifecycle_menu_state = (1 << MODE_EXIT);
break;
case S_RETURN_TO_GAME: case S_RETURN_TO_GAME:
g_extern.lifecycle_menu_state = (1 << MODE_EMULATION); g_extern.lifecycle_menu_state = (1 << MODE_EMULATION);
break; break;

2
console/rarch_console_settings.h
View File

@ -39,10 +39,8 @@ enum
S_HW_TEXTURE_FILTER_2, S_HW_TEXTURE_FILTER_2,
S_OVERSCAN_DECREMENT, S_OVERSCAN_DECREMENT,
S_OVERSCAN_INCREMENT, S_OVERSCAN_INCREMENT,
S_QUIT,
S_RESOLUTION_PREVIOUS, S_RESOLUTION_PREVIOUS,
S_RESOLUTION_NEXT, S_RESOLUTION_NEXT,
S_QUIT_RARCH,
S_RETURN_TO_GAME, S_RETURN_TO_GAME,
S_RETURN_TO_LAUNCHER, S_RETURN_TO_LAUNCHER,
S_RETURN_TO_MENU, S_RETURN_TO_MENU,

8
frontend/menu/rgui.c
View File

@ -238,7 +238,8 @@ rgui_handle_t *rgui_init(const char *base_path,
else else
{ {
RARCH_ERR("no font bmp or bin, abort"); RARCH_ERR("no font bmp or bin, abort");
rarch_settings_change(S_QUIT); g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION));
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT);
} }
return rgui; return rgui;
@ -764,7 +765,10 @@ static void rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
break; break;
case RGUI_SETTINGS_QUIT_EMULATOR: case RGUI_SETTINGS_QUIT_EMULATOR:
if (action == RGUI_ACTION_OK) if (action == RGUI_ACTION_OK)
rarch_settings_change(S_QUIT); {
g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION));
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT);
}
break; break;
// controllers // controllers
case RGUI_SETTINGS_BIND_DEVICE: case RGUI_SETTINGS_BIND_DEVICE:

8
frontend/menu/rmenu.c
View File

@ -1415,7 +1415,8 @@ static void set_setting_action(void *data, unsigned switchvalue, uint64_t input)
case SETTING_QUIT_RARCH: case SETTING_QUIT_RARCH:
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
{ {
rarch_settings_change(S_QUIT_RARCH); g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION));
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT);
} }
break; break;
case SETTING_EMU_AUDIO_MUTE: case SETTING_EMU_AUDIO_MUTE:
@ -2202,7 +2203,10 @@ int ingame_menu(void *data, void *state)
#endif #endif
case MENU_ITEM_QUIT_RARCH: case MENU_ITEM_QUIT_RARCH:
if(input & (1ULL << RMENU_DEVICE_NAV_B)) if(input & (1ULL << RMENU_DEVICE_NAV_B))
rarch_settings_change(S_QUIT_RARCH); {
g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION));
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT);
}
snprintf(strw_buffer, sizeof(strw_buffer), "Press [%s] to quit RetroArch.", rarch_input_find_platform_key_label(1ULL << RETRO_DEVICE_ID_JOYPAD_B)); snprintf(strw_buffer, sizeof(strw_buffer), "Press [%s] to quit RetroArch.", rarch_input_find_platform_key_label(1ULL << RETRO_DEVICE_ID_JOYPAD_B));
break; break;

8
frontend/menu/rmenu_xui.cpp
View File

@ -836,7 +836,8 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
rarch_settings_change(S_RETURN_TO_GAME); rarch_settings_change(S_RETURN_TO_GAME);
break; break;
case MENU_ITEM_QUIT_RARCH: case MENU_ITEM_QUIT_RARCH:
rarch_settings_change(S_QUIT_RARCH); g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION));
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT);
break; break;
} }
} }
@ -1045,7 +1046,10 @@ HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
NavigateForward(app.hRetroArchSettings); NavigateForward(app.hRetroArchSettings);
} }
else if ( hObjPressed == m_quit ) else if ( hObjPressed == m_quit )
rarch_settings_change(S_QUIT_RARCH); {
g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION));
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT);
}
bHandled = TRUE; bHandled = TRUE;
return 0; return 0;

3
frontend/platform/platform_ps3.c
View File

@ -156,7 +156,8 @@ static void callback_sysutil_exit(uint64_t status, uint64_t param, void *userdat
{ {
case CELL_SYSUTIL_REQUEST_EXITGAME: case CELL_SYSUTIL_REQUEST_EXITGAME:
gl->quitting = true; gl->quitting = true;
rarch_settings_change(S_QUIT); g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION));
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT);
break; break;
#ifdef HAVE_OSKUTIL #ifdef HAVE_OSKUTIL
case CELL_SYSUTIL_OSKDIALOG_FINISHED: case CELL_SYSUTIL_OSKDIALOG_FINISHED: