mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-25 16:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename MODE_EMULATION define to MODE_GAME

Browse Source
This commit is contained in:
twinaphex 2013-01-13 03:34:55 +01:00
parent 0f2e36d349
commit c1f5fc8890
8 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/frontend_console.c
View File

@ -303,7 +303,7 @@ int main(int argc, char *argv[])
system_process_args(argc, argv); system_process_args(argc, argv);
begin_loop: begin_loop:
if(g_extern.lifecycle_mode_state & (1ULL << MODE_EMULATION)) if(g_extern.lifecycle_mode_state & (1ULL << MODE_GAME))
{ {
driver.input->poll(NULL); driver.input->poll(NULL);
driver.video->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx); driver.video->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
@ -315,7 +315,7 @@ begin_loop:
if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_THROTTLE_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_THROTTLE_ENABLE))
audio_stop_func(); audio_stop_func();
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME);
} }
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_INIT)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_INIT))
{ {
@ -336,7 +336,7 @@ begin_loop:
if (init_ret == 0) if (init_ret == 0)
{ {
RARCH_LOG("rarch_main_init succeeded.\n"); RARCH_LOG("rarch_main_init succeeded.\n");
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
} }
else else
{ {

10
frontend/menu/rgui.c
View File

@ -238,7 +238,7 @@ 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");
g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_MENU_INGAME) | (1ULL << MODE_EMULATION)); g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_MENU_INGAME) | (1ULL << MODE_GAME));
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
} }
@ -575,7 +575,7 @@ static int 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();
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
return -1; return -1;
} }
else if (action == RGUI_ACTION_START) else if (action == RGUI_ACTION_START)
@ -606,7 +606,7 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
if (action == RGUI_ACTION_OK) if (action == RGUI_ACTION_OK)
{ {
rarch_game_reset(); rarch_game_reset();
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
return -1; return -1;
} }
break; break;
@ -786,7 +786,7 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
#ifdef GEKKO #ifdef GEKKO
snprintf(g_extern.fullpath, sizeof(g_extern.fullpath), "%s/boot.dol", default_paths.core_dir); snprintf(g_extern.fullpath, sizeof(g_extern.fullpath), "%s/boot.dol", default_paths.core_dir);
#endif #endif
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME);
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);
return -1; return -1;
@ -795,7 +795,7 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
case RGUI_SETTINGS_QUIT_EMULATOR: case RGUI_SETTINGS_QUIT_EMULATOR:
if (action == RGUI_ACTION_OK) if (action == RGUI_ACTION_OK)
{ {
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME);
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
return -1; return -1;
} }

20
frontend/menu/rmenu.c
View File

@ -1454,7 +1454,7 @@ static int 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)))
{ {
g_extern.lifecycle_mode_state &= ~((1ULL << MODE_EMULATION)); g_extern.lifecycle_mode_state &= ~((1ULL << MODE_GAME));
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
return -1; return -1;
} }
@ -2125,7 +2125,7 @@ int ingame_menu(void *data, void *state)
if(input & (1ULL << RMENU_DEVICE_NAV_A)) if(input & (1ULL << RMENU_DEVICE_NAV_A))
{ {
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_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
return -1; return -1;
} }
@ -2135,7 +2135,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();
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); 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);
return -1; return -1;
} }
@ -2150,7 +2150,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();
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); 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);
return -1; return -1;
} }
@ -2232,7 +2232,7 @@ int ingame_menu(void *data, void *state)
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))
{ {
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); 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);
return -1; return -1;
} }
@ -2243,7 +2243,7 @@ int ingame_menu(void *data, void *state)
if(input & (1ULL << RMENU_DEVICE_NAV_B)) if(input & (1ULL << RMENU_DEVICE_NAV_B))
{ {
rarch_game_reset(); rarch_game_reset();
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); 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);
return -1; return -1;
} }
@ -2274,7 +2274,7 @@ 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.fullpath, default_paths.multiman_self_file, sizeof(g_extern.fullpath)); strlcpy(g_extern.fullpath, default_paths.multiman_self_file, sizeof(g_extern.fullpath));
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION); 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);
@ -2286,7 +2286,7 @@ int ingame_menu(void *data, void *state)
case MENU_ITEM_QUIT_RARCH: case MENU_ITEM_QUIT_RARCH:
if(input & (1ULL << RMENU_DEVICE_NAV_B)) if(input & (1ULL << RMENU_DEVICE_NAV_B))
{ {
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME);
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME_EXIT);
return -1; return -1;
@ -2314,7 +2314,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)))
{ {
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); 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);
return -1; return -1;
} }
@ -2457,7 +2457,7 @@ int rmenu_input_process(void *data, void *state)
if (return_to_game_enable) if (return_to_game_enable)
{ {
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
return -1; return -1;
} }
} }

2
frontend/menu/rmenu_gx.c
View File

@ -186,7 +186,7 @@ int rmenu_input_process(void *data, void *state)
if (return_to_game_enable) if (return_to_game_enable)
{ {
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
return -1; return -1;
} }
} }

2
frontend/menu/rmenu_settings.c
View File

@ -51,7 +51,7 @@ void rmenu_settings_set(unsigned setting)
break; break;
case S_FRAME_ADVANCE: case S_FRAME_ADVANCE:
g_extern.lifecycle_state |= (1ULL << RARCH_FRAMEADVANCE); g_extern.lifecycle_state |= (1ULL << RARCH_FRAMEADVANCE);
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
break; break;
case S_HW_TEXTURE_FILTER: case S_HW_TEXTURE_FILTER:
g_settings.video.smooth = !g_settings.video.smooth; g_settings.video.smooth = !g_settings.video.smooth;

14
frontend/menu/rmenu_xui.cpp
View File

@ -837,7 +837,7 @@ 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();
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
process_input_ret = -1; process_input_ret = -1;
} }
break; break;
@ -845,7 +845,7 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
if (g_extern.main_is_init) if (g_extern.main_is_init)
{ {
rarch_save_state(); rarch_save_state();
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
process_input_ret = -1; process_input_ret = -1;
} }
break; break;
@ -887,19 +887,19 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
if (g_extern.main_is_init) if (g_extern.main_is_init)
{ {
rarch_game_reset(); rarch_game_reset();
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
process_input_ret = -1; process_input_ret = -1;
} }
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)
{ {
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
process_input_ret = -1; process_input_ret = -1;
} }
break; break;
case MENU_ITEM_QUIT_RARCH: case MENU_ITEM_QUIT_RARCH:
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME);
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
process_input_ret = -1; process_input_ret = -1;
break; break;
@ -1110,7 +1110,7 @@ HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
} }
else if (hObjPressed == m_quit) else if (hObjPressed == m_quit)
{ {
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME);
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
process_input_ret = -1; process_input_ret = -1;
} }
@ -1265,7 +1265,7 @@ bool rmenu_iterate(void)
if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU))
if (rmenu_enable) if (rmenu_enable)
{ {
g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
process_input_ret = -1; process_input_ret = -1;
} }
} }

2
frontend/platform/platform_ps3.c
View File

@ -155,7 +155,7 @@ 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;
g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_MENU_INGAME) | (1ULL << MODE_EMULATION)); g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_MENU_INGAME) | (1ULL << MODE_GAME));
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
break; break;
#ifdef HAVE_OSKUTIL #ifdef HAVE_OSKUTIL

6
general.h
View File

@ -102,8 +102,10 @@ enum dpad_emu_enums
enum menu_enums enum menu_enums
{ {
MODE_EMULATION = 0, MODE_GAME = 0,
MODE_LOAD_GAME, MODE_LOAD_GAME,
MODE_LOAD_FIRST_SHADER,
MODE_LOAD_SECOND_SHADER,
MODE_INIT, MODE_INIT,
MODE_MENU, MODE_MENU,
MODE_MENU_WIDESCREEN, MODE_MENU_WIDESCREEN,
@ -119,8 +121,6 @@ enum menu_enums
MODE_EXTLAUNCH_MULTIMAN, MODE_EXTLAUNCH_MULTIMAN,
MODE_EXIT, MODE_EXIT,
MODE_EXITSPAWN, MODE_EXITSPAWN,
MODE_LOAD_FIRST_SHADER,
MODE_LOAD_SECOND_SHADER,
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,