mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade lifecycle_menu_state to 64bit variable lifecycle_mode_state

Browse Source
This commit is contained in:
twinaphex 2013-01-12 03:13:03 +01:00
parent d6dd17bab1
commit 04cacb5e30
20 changed files with 412 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
console/rarch_zlib.c
View File

@ -68,11 +68,11 @@ static int rarch_zlib_extract_file(unzFile uf,
return UNZ_INTERNALERROR; return UNZ_INTERNALERROR;
} }
if ((g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR)) || if ((g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR)) ||
(g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE))) (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE)))
fill_pathname_join(out_fname, current_dir, fname_inzip, out_fname_size); fill_pathname_join(out_fname, current_dir, fname_inzip, out_fname_size);
#if defined(HAVE_HDD_CACHE_PARTITION) && defined(RARCH_CONSOLE) #if defined(HAVE_HDD_CACHE_PARTITION) && defined(RARCH_CONSOLE)
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CACHEDIR)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CACHEDIR))
fill_pathname_join(out_fname, default_paths.cache_dir, fname_inzip, out_fname_size); fill_pathname_join(out_fname, default_paths.cache_dir, fname_inzip, out_fname_size);
#endif #endif

30
frontend/frontend_console.c
View File

@ -112,10 +112,10 @@ void console_load_game(const char *path)
first_file[0] = '\0'; first_file[0] = '\0';
rarch_zlib_extract_archive(path, first_file, sizeof(first_file)); rarch_zlib_extract_archive(path, first_file, sizeof(first_file));
if(g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if(g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_EXTRACTED_ZIPFILE, S_DELAY_180); rmenu_settings_msg(S_MSG_EXTRACTED_ZIPFILE, S_DELAY_180);
if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE))
{ {
if (first_file[0] != 0) if (first_file[0] != 0)
{ {
@ -133,7 +133,7 @@ void console_load_game(const char *path)
snprintf(g_extern.fullpath, sizeof(g_extern.fullpath), path); snprintf(g_extern.fullpath, sizeof(g_extern.fullpath), path);
do_init: do_init:
g_extern.lifecycle_menu_state |= (1 << MODE_LOAD_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME);
} }
static void verbose_log_init(void) static void verbose_log_init(void)
@ -303,21 +303,21 @@ int main(int argc, char *argv[])
system_process_args(argc, argv); system_process_args(argc, argv);
begin_loop: begin_loop:
if(g_extern.lifecycle_menu_state & (1 << MODE_EMULATION)) if(g_extern.lifecycle_mode_state & (1ULL << MODE_EMULATION))
{ {
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);
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_THROTTLE_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_THROTTLE_ENABLE))
audio_start_func(); audio_start_func();
while(rarch_main_iterate()); while(rarch_main_iterate());
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_THROTTLE_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_THROTTLE_ENABLE))
audio_stop_func(); audio_stop_func();
g_extern.lifecycle_menu_state &= ~(1 << MODE_EMULATION); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION);
} }
else if (g_extern.lifecycle_menu_state & (1 << MODE_INIT)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_INIT))
{ {
if(g_extern.main_is_init) if(g_extern.main_is_init)
rarch_main_deinit(); rarch_main_deinit();
@ -336,21 +336,21 @@ 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_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
} }
else else
{ {
RARCH_ERR("rarch_main_init failed.\n"); RARCH_ERR("rarch_main_init failed.\n");
g_extern.lifecycle_menu_state |= (1 << MODE_MENU); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU);
rmenu_settings_msg(S_MSG_ROM_LOADING_ERROR, S_DELAY_180); rmenu_settings_msg(S_MSG_ROM_LOADING_ERROR, S_DELAY_180);
} }
g_extern.lifecycle_menu_state &= ~(1 << MODE_INIT); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INIT);
} }
else if(g_extern.lifecycle_menu_state & (1 << MODE_MENU)) else if(g_extern.lifecycle_mode_state & (1ULL << MODE_MENU))
{ {
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_PREINIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_PREINIT);
while(rmenu_iterate()); while(rmenu_iterate());
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU);
} }
else else
goto begin_shutdown; goto begin_shutdown;
@ -373,7 +373,7 @@ begin_shutdown:
#endif #endif
system_deinit(); system_deinit();
if (g_extern.lifecycle_menu_state & (1 << MODE_EXITSPAWN)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXITSPAWN))
system_exitspawn(); system_exitspawn();
return 1; return 1;

72
frontend/menu/rgui.c
View File

@ -238,8 +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");
g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION)); g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_MENU_INGAME) | (1ULL << MODE_EMULATION));
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
} }
return rgui; return rgui;
@ -363,7 +363,7 @@ static void render_messagebox(rgui_handle_t *rgui, const char *message)
static void render_text(rgui_handle_t *rgui) static void render_text(rgui_handle_t *rgui)
{ {
if (rgui->need_refresh && if (rgui->need_refresh &&
(g_extern.lifecycle_menu_state & (1ULL << MODE_MENU)) (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU))
&& !rgui->msg_force) && !rgui->msg_force)
return; return;
@ -428,7 +428,7 @@ static void render_text(rgui_handle_t *rgui)
break; break;
#ifdef HW_RVL #ifdef HW_RVL
case RGUI_SETTINGS_VIDEO_SOFT_FILTER: case RGUI_SETTINGS_VIDEO_SOFT_FILTER:
snprintf(type_str, sizeof(type_str), (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_SOFT_FILTER_ENABLE)) ? "ON" : "OFF"); snprintf(type_str, sizeof(type_str), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE)) ? "ON" : "OFF");
break; break;
#endif #endif
#ifdef GEKKO #ifdef GEKKO
@ -459,11 +459,11 @@ static void render_text(rgui_handle_t *rgui)
snprintf(type_str, sizeof(type_str), "%.3f", g_settings.audio.rate_control_delta); snprintf(type_str, sizeof(type_str), "%.3f", g_settings.audio.rate_control_delta);
break; break;
case RGUI_SETTINGS_ZIP_EXTRACT: case RGUI_SETTINGS_ZIP_EXTRACT:
if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR))
snprintf(type_str, sizeof(type_str), "Current"); snprintf(type_str, sizeof(type_str), "Current");
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE))
snprintf(type_str, sizeof(type_str), "Current + Load"); snprintf(type_str, sizeof(type_str), "Current + Load");
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CACHEDIR)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CACHEDIR))
snprintf(type_str, sizeof(type_str), "Cache"); snprintf(type_str, sizeof(type_str), "Cache");
break; break;
case RGUI_SETTINGS_SRAM_DIR: case RGUI_SETTINGS_SRAM_DIR:
@ -473,7 +473,7 @@ static void render_text(rgui_handle_t *rgui)
snprintf(type_str, sizeof(type_str), g_extern.console.main_wrap.state.default_savestate_dir.enable ? "ON" : "OFF"); snprintf(type_str, sizeof(type_str), g_extern.console.main_wrap.state.default_savestate_dir.enable ? "ON" : "OFF");
break; break;
case RGUI_SETTINGS_DEBUG_TEXT: case RGUI_SETTINGS_DEBUG_TEXT:
snprintf(type_str, sizeof(type_str), (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? "ON" : "OFF"); snprintf(type_str, sizeof(type_str), (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? "ON" : "OFF");
break; break;
case RGUI_SETTINGS_CUSTOM_VIEWPORT: case RGUI_SETTINGS_CUSTOM_VIEWPORT:
case RGUI_SETTINGS_CORE: case RGUI_SETTINGS_CORE:
@ -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_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
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_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
return -1; return -1;
} }
break; break;
@ -619,10 +619,10 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
#ifdef HW_RVL #ifdef HW_RVL
case RGUI_SETTINGS_VIDEO_SOFT_FILTER: case RGUI_SETTINGS_VIDEO_SOFT_FILTER:
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_SOFT_FILTER_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE))
g_extern.lifecycle_menu_state &= ~(1 << MODE_VIDEO_SOFT_FILTER_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_SOFT_FILTER_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE);
driver.video->apply_state_changes(); driver.video->apply_state_changes();
} }
break; break;
@ -730,35 +730,35 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
case RGUI_SETTINGS_ZIP_EXTRACT: case RGUI_SETTINGS_ZIP_EXTRACT:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)
{ {
g_extern.lifecycle_menu_state &= ~((1 << MODE_UNZIP_TO_CURDIR) | g_extern.lifecycle_mode_state &= ~((1ULL << MODE_UNZIP_TO_CURDIR) |
(1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE) | (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE) |
(1 << MODE_UNZIP_TO_CACHEDIR)); (1ULL << MODE_UNZIP_TO_CACHEDIR));
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
} }
else if (action == RGUI_ACTION_LEFT) else if (action == RGUI_ACTION_LEFT)
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CACHEDIR)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CACHEDIR))
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_UNZIP_TO_CACHEDIR); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_UNZIP_TO_CACHEDIR);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
} }
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE))
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR);
} }
} }
else if (action == RGUI_ACTION_RIGHT) else if (action == RGUI_ACTION_RIGHT)
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR))
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_UNZIP_TO_CURDIR); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_UNZIP_TO_CURDIR);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
} }
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE))
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CACHEDIR); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CACHEDIR);
} }
} }
break; break;
@ -776,9 +776,9 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
break; break;
case RGUI_SETTINGS_DEBUG_TEXT: case RGUI_SETTINGS_DEBUG_TEXT:
if (action == RGUI_ACTION_START || action == RGUI_ACTION_LEFT) if (action == RGUI_ACTION_START || action == RGUI_ACTION_LEFT)
g_extern.lifecycle_menu_state &= ~(1 << MODE_FPS_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_FPS_DRAW);
else if (action == RGUI_ACTION_RIGHT) else if (action == RGUI_ACTION_RIGHT)
g_extern.lifecycle_menu_state |= (1 << MODE_FPS_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_FPS_DRAW);
break; break;
case RGUI_SETTINGS_RESTART_EMULATOR: case RGUI_SETTINGS_RESTART_EMULATOR:
if (action == RGUI_ACTION_OK) if (action == RGUI_ACTION_OK)
@ -786,17 +786,17 @@ 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_menu_state &= ~(1 << MODE_EMULATION); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION);
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
g_extern.lifecycle_menu_state |= (1 << MODE_EXITSPAWN); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXITSPAWN);
return -1; return -1;
} }
break; break;
case RGUI_SETTINGS_QUIT_EMULATOR: case RGUI_SETTINGS_QUIT_EMULATOR:
if (action == RGUI_ACTION_OK) if (action == RGUI_ACTION_OK)
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_EMULATION); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION);
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
return -1; return -1;
} }
break; break;

220
frontend/menu/rmenu.c
View File

@ -205,7 +205,7 @@ static void populate_setting_item(void *data, unsigned input)
break; break;
case SETTING_SOFT_DISPLAY_FILTER: case SETTING_SOFT_DISPLAY_FILTER:
snprintf(current_item->text, sizeof(current_item->text), "Soft Display Filter"); snprintf(current_item->text, sizeof(current_item->text), "Soft Display Filter");
snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_SOFT_FILTER_ENABLE)) ? "ON" : "OFF"); snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE)) ? "ON" : "OFF");
snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Toggle the [Soft Display Filter]."); snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Toggle the [Soft Display Filter].");
break; break;
#endif #endif
@ -216,18 +216,18 @@ static void populate_setting_item(void *data, unsigned input)
break; break;
case SETTING_THROTTLE_MODE: case SETTING_THROTTLE_MODE:
snprintf(current_item->text, sizeof(current_item->text), "Throttle Mode"); snprintf(current_item->text, sizeof(current_item->text), "Throttle Mode");
snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_THROTTLE_ENABLE)) ? "ON" : "OFF"); snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_THROTTLE_ENABLE)) ? "ON" : "OFF");
snprintf(current_item->comment, sizeof(current_item->comment), (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_THROTTLE_ENABLE)) ? "INFO - [Throttle Mode] is 'ON' - Vsync is enabled." : "INFO - [Throttle Mode] is 'OFF' - Vsync is disabled."); snprintf(current_item->comment, sizeof(current_item->comment), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_THROTTLE_ENABLE)) ? "INFO - [Throttle Mode] is 'ON' - Vsync is enabled." : "INFO - [Throttle Mode] is 'OFF' - Vsync is disabled.");
break; break;
case SETTING_TRIPLE_BUFFERING: case SETTING_TRIPLE_BUFFERING:
snprintf(current_item->text, sizeof(current_item->text), "Triple Buffering"); snprintf(current_item->text, sizeof(current_item->text), "Triple Buffering");
snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE)) ? "ON" : "OFF"); snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE)) ? "ON" : "OFF");
snprintf(current_item->comment, sizeof(current_item->comment), (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE)) ? "INFO - [Triple Buffering] is set to 'ON'." : "INFO - [Triple Buffering] is set to 'OFF'."); snprintf(current_item->comment, sizeof(current_item->comment), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE)) ? "INFO - [Triple Buffering] is set to 'ON'." : "INFO - [Triple Buffering] is set to 'OFF'.");
break; break;
case SETTING_ENABLE_SCREENSHOTS: case SETTING_ENABLE_SCREENSHOTS:
snprintf(current_item->text, sizeof(current_item->text), "Screenshot Option"); snprintf(current_item->text, sizeof(current_item->text), "Screenshot Option");
snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_SCREENSHOTS_ENABLE)) ? "ON" : "OFF"); snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE)) ? "ON" : "OFF");
snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Screenshots feature is set to '%s'.", (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_SCREENSHOTS_ENABLE)) ? "ON" : "OFF"); snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Screenshots feature is set to '%s'.", (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE)) ? "ON" : "OFF");
break; break;
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
case SETTING_APPLY_SHADER_PRESET_ON_STARTUP: case SETTING_APPLY_SHADER_PRESET_ON_STARTUP:
@ -285,12 +285,12 @@ static void populate_setting_item(void *data, unsigned input)
/* emu-specific */ /* emu-specific */
case SETTING_EMU_SHOW_DEBUG_INFO_MSG: case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
snprintf(current_item->text, sizeof(current_item->text), "Debug info messages"); snprintf(current_item->text, sizeof(current_item->text), "Debug info messages");
snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? "ON" : "OFF"); snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? "ON" : "OFF");
snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Show onscreen debug messages."); snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Show onscreen debug messages.");
break; break;
case SETTING_EMU_SHOW_INFO_MSG: case SETTING_EMU_SHOW_INFO_MSG:
snprintf(current_item->text, sizeof(current_item->text), "Info messages"); snprintf(current_item->text, sizeof(current_item->text), "Info messages");
snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) ? "ON" : "OFF"); snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) ? "ON" : "OFF");
snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Show onscreen info messages in the menu."); snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Show onscreen info messages in the menu.");
break; break;
case SETTING_EMU_REWIND_ENABLED: case SETTING_EMU_REWIND_ENABLED:
@ -304,17 +304,17 @@ static void populate_setting_item(void *data, unsigned input)
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
case SETTING_ZIP_EXTRACT: case SETTING_ZIP_EXTRACT:
snprintf(current_item->text, sizeof(current_item->text), "ZIP Extract Option"); snprintf(current_item->text, sizeof(current_item->text), "ZIP Extract Option");
if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR))
{ {
snprintf(current_item->setting_text, sizeof(current_item->setting_text), "Current dir"); snprintf(current_item->setting_text, sizeof(current_item->setting_text), "Current dir");
snprintf(current_item->comment, sizeof(current_item->comment), "INFO - ZIP files are extracted to the current dir."); snprintf(current_item->comment, sizeof(current_item->comment), "INFO - ZIP files are extracted to the current dir.");
} }
else if (g_extern.lifecycle_menu_state & (1 <<MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE)) else if (g_extern.lifecycle_mode_state & (1ULL <<MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE))
{ {
snprintf(current_item->setting_text, sizeof(current_item->setting_text), "Current dir and load first file"); snprintf(current_item->setting_text, sizeof(current_item->setting_text), "Current dir and load first file");
snprintf(current_item->comment, sizeof(current_item->comment), "INFO - ZIP files are extracted to current dir, and auto-loaded."); snprintf(current_item->comment, sizeof(current_item->comment), "INFO - ZIP files are extracted to current dir, and auto-loaded.");
} }
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CACHEDIR)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CACHEDIR))
{ {
snprintf(current_item->setting_text, sizeof(current_item->setting_text), "Cache dir"); snprintf(current_item->setting_text, sizeof(current_item->setting_text), "Cache dir");
snprintf(current_item->comment, sizeof(current_item->comment), "INFO - ZIP files are extracted to the cache dir."); snprintf(current_item->comment, sizeof(current_item->comment), "INFO - ZIP files are extracted to the cache dir.");
@ -352,8 +352,8 @@ static void populate_setting_item(void *data, unsigned input)
#endif #endif
case SETTING_ENABLE_CUSTOM_BGM: case SETTING_ENABLE_CUSTOM_BGM:
snprintf(current_item->text, sizeof(current_item->text), "Custom BGM Option"); snprintf(current_item->text, sizeof(current_item->text), "Custom BGM Option");
snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_menu_state & (1 << MODE_AUDIO_CUSTOM_BGM_ENABLE)) ? "ON" : "OFF"); snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE)) ? "ON" : "OFF");
snprintf(current_item->comment, sizeof(current_item->comment), "INFO - [Custom BGM] is set to '%s'.", (g_extern.lifecycle_menu_state & (1 << MODE_AUDIO_CUSTOM_BGM_ENABLE)) ? "ON" : "OFF"); snprintf(current_item->comment, sizeof(current_item->comment), "INFO - [Custom BGM] is set to '%s'.", (g_extern.lifecycle_mode_state & (1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE)) ? "ON" : "OFF");
break; break;
case SETTING_PATH_DEFAULT_ROM_DIRECTORY: case SETTING_PATH_DEFAULT_ROM_DIRECTORY:
snprintf(current_item->text, sizeof(current_item->text), "Startup ROM Directory"); snprintf(current_item->text, sizeof(current_item->text), "Startup ROM Directory");
@ -663,36 +663,36 @@ int select_file(void *data, void *state)
{ {
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
case SHADER_CHOICE: case SHADER_CHOICE:
if (g_extern.lifecycle_menu_state & (1 << MODE_LOAD_FIRST_SHADER)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_FIRST_SHADER))
{ {
strlcpy(g_settings.video.cg_shader_path, path, sizeof(g_settings.video.cg_shader_path)); strlcpy(g_settings.video.cg_shader_path, path, sizeof(g_settings.video.cg_shader_path));
if (g_settings.video.shader_type != RARCH_SHADER_NONE) if (g_settings.video.shader_type != RARCH_SHADER_NONE)
{ {
driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, path, RARCH_SHADER_INDEX_PASS0); driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, path, RARCH_SHADER_INDEX_PASS0);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180);
} }
else else
RARCH_ERR("Shaders are unsupported on this platform.\n"); RARCH_ERR("Shaders are unsupported on this platform.\n");
g_extern.lifecycle_menu_state &= ~(1 << MODE_LOAD_FIRST_SHADER); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_FIRST_SHADER);
} }
if (g_extern.lifecycle_menu_state & (1 << MODE_LOAD_SECOND_SHADER)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_SECOND_SHADER))
{ {
strlcpy(g_settings.video.second_pass_shader, path, sizeof(g_settings.video.second_pass_shader)); strlcpy(g_settings.video.second_pass_shader, path, sizeof(g_settings.video.second_pass_shader));
if (g_settings.video.shader_type != RARCH_SHADER_NONE) if (g_settings.video.shader_type != RARCH_SHADER_NONE)
{ {
driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, path, RARCH_SHADER_INDEX_PASS1); driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, path, RARCH_SHADER_INDEX_PASS1);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180);
} }
else else
RARCH_ERR("Shaders are unsupported on this platform.\n"); RARCH_ERR("Shaders are unsupported on this platform.\n");
g_extern.lifecycle_menu_state &= ~(1 << MODE_LOAD_SECOND_SHADER); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_SECOND_SHADER);
} }
break; break;
case PRESET_CHOICE: case PRESET_CHOICE:
@ -717,13 +717,13 @@ int select_file(void *data, void *state)
{ {
strlcpy(g_extern.fullpath, path, sizeof(g_extern.fullpath)); strlcpy(g_extern.fullpath, path, sizeof(g_extern.fullpath));
set_libretro_core_as_launch = false; set_libretro_core_as_launch = false;
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
g_extern.lifecycle_menu_state |= (1 << MODE_EXITSPAWN); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXITSPAWN);
return -1; return -1;
} }
else else
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
} }
break; break;
@ -1079,7 +1079,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
{ {
menu_stack_push(SHADER_CHOICE); menu_stack_push(SHADER_CHOICE);
filebrowser_set_root_and_ext(filebrowser, EXT_SHADERS, default_paths.shader_dir); filebrowser_set_root_and_ext(filebrowser, EXT_SHADERS, default_paths.shader_dir);
g_extern.lifecycle_menu_state |= (1 << MODE_LOAD_FIRST_SHADER); g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_FIRST_SHADER);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
@ -1087,7 +1087,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
if (g_settings.video.shader_type != RARCH_SHADER_NONE) if (g_settings.video.shader_type != RARCH_SHADER_NONE)
{ {
driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, NULL, RARCH_SHADER_INDEX_PASS0); driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, NULL, RARCH_SHADER_INDEX_PASS0);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180);
} }
else else
@ -1099,7 +1099,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
{ {
menu_stack_push(SHADER_CHOICE); menu_stack_push(SHADER_CHOICE);
filebrowser_set_root_and_ext(filebrowser, EXT_SHADERS, default_paths.shader_dir); filebrowser_set_root_and_ext(filebrowser, EXT_SHADERS, default_paths.shader_dir);
g_extern.lifecycle_menu_state |= (1 << MODE_LOAD_SECOND_SHADER); g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_SECOND_SHADER);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
@ -1107,7 +1107,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
if (g_settings.video.shader_type != RARCH_SHADER_NONE) if (g_settings.video.shader_type != RARCH_SHADER_NONE)
{ {
driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, NULL, RARCH_SHADER_INDEX_PASS1); driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, NULL, RARCH_SHADER_INDEX_PASS1);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180);
} }
else else
@ -1238,13 +1238,13 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
case SETTING_SOFT_DISPLAY_FILTER: case SETTING_SOFT_DISPLAY_FILTER:
if(input & (1ULL << RMENU_DEVICE_NAV_LEFT) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (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)))
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_SOFT_FILTER_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE))
g_extern.lifecycle_menu_state &= ~(1 << MODE_VIDEO_SOFT_FILTER_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_SOFT_FILTER_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_SOFT_FILTER_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE);
break; break;
#endif #endif
case SETTING_HW_OVERSCAN_AMOUNT: case SETTING_HW_OVERSCAN_AMOUNT:
@ -1268,12 +1268,12 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (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)))
{ {
rmenu_settings_set(S_THROTTLE); rmenu_settings_set(S_THROTTLE);
device_ptr->ctx_driver->swap_interval((g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_THROTTLE_ENABLE))); device_ptr->ctx_driver->swap_interval((g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_THROTTLE_ENABLE)) ? true : false);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
rmenu_settings_set_default(S_DEF_THROTTLE); rmenu_settings_set_default(S_DEF_THROTTLE);
device_ptr->ctx_driver->swap_interval((g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_THROTTLE_ENABLE))); device_ptr->ctx_driver->swap_interval((g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_THROTTLE_ENABLE)) ? true : false);
} }
break; break;
case SETTING_TRIPLE_BUFFERING: case SETTING_TRIPLE_BUFFERING:
@ -1286,23 +1286,23 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
{ {
rmenu_settings_set_default(S_DEF_TRIPLE_BUFFERING); rmenu_settings_set_default(S_DEF_TRIPLE_BUFFERING);
if(!(g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE))) if(!(g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE)))
driver.video->restart(); driver.video->restart();
} }
break; break;
case SETTING_ENABLE_SCREENSHOTS: case SETTING_ENABLE_SCREENSHOTS:
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (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)))
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_SCREENSHOTS_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE))
g_extern.lifecycle_menu_state &= ~(1 << MODE_VIDEO_SCREENSHOTS_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_SCREENSHOTS_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE);
device_ptr->ctx_driver->rmenu_screenshot_enable((g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_SCREENSHOTS_ENABLE))); device_ptr->ctx_driver->rmenu_screenshot_enable((g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE)) ? true : false);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_SCREENSHOTS_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE);
device_ptr->ctx_driver->rmenu_screenshot_enable((g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_SCREENSHOTS_ENABLE))); device_ptr->ctx_driver->rmenu_screenshot_enable((g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE)) ? true : false);
} }
break; break;
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
@ -1373,31 +1373,31 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
case SETTING_EMU_SHOW_DEBUG_INFO_MSG: case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (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)))
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW))
g_extern.lifecycle_menu_state &= ~(1 << MODE_FPS_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_FPS_DRAW);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_FPS_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_FPS_DRAW);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
g_extern.lifecycle_menu_state &= ~(1 << MODE_FPS_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_FPS_DRAW);
break; break;
case SETTING_EMU_SHOW_INFO_MSG: case SETTING_EMU_SHOW_INFO_MSG:
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (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)))
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
g_extern.lifecycle_menu_state &= ~(1 << MODE_INFO_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INFO_DRAW);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_INFO_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_INFO_DRAW);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
g_extern.lifecycle_menu_state |= (1 << MODE_INFO_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_INFO_DRAW);
break; break;
case SETTING_EMU_REWIND_ENABLED: case SETTING_EMU_REWIND_ENABLED:
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (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)))
{ {
rmenu_settings_set(S_REWIND); rmenu_settings_set(S_REWIND);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
@ -1407,36 +1407,36 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
case SETTING_ZIP_EXTRACT: case SETTING_ZIP_EXTRACT:
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT))) if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)))
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CACHEDIR)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CACHEDIR))
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_UNZIP_TO_CACHEDIR); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_UNZIP_TO_CACHEDIR);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
} }
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE))
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR);
} }
} }
if((input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) if((input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR))
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_UNZIP_TO_CURDIR); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_UNZIP_TO_CURDIR);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
} }
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE))
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CACHEDIR); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CACHEDIR);
} }
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
g_extern.lifecycle_menu_state &= ~((1 << MODE_UNZIP_TO_CURDIR) | g_extern.lifecycle_mode_state &= ~((1ULL << MODE_UNZIP_TO_CURDIR) |
(1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE) | (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE) |
(1 << MODE_UNZIP_TO_CACHEDIR)); (1ULL << MODE_UNZIP_TO_CACHEDIR));
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
} }
break; break;
#endif #endif
@ -1454,8 +1454,8 @@ 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_menu_state &= ~((1 << MODE_EMULATION)); g_extern.lifecycle_mode_state &= ~((1ULL << MODE_EMULATION));
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
return -1; return -1;
} }
break; break;
@ -1471,14 +1471,14 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (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)))
{ {
g_extern.console.sound.volume_level = !g_extern.console.sound.volume_level; g_extern.console.sound.volume_level = !g_extern.console.sound.volume_level;
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
g_extern.console.sound.volume_level = 0; g_extern.console.sound.volume_level = 0;
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
} }
break; break;
@ -1487,11 +1487,11 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (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)))
{ {
#if(CELL_SDK_VERSION > 0x340000) #if(CELL_SDK_VERSION > 0x340000)
if (g_extern.lifecycle_menu_state & (1 << MODE_AUDIO_CUSTOM_BGM_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE))
g_extern.lifecycle_menu_state &= ~(1 << MODE_AUDIO_CUSTOM_BGM_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_AUDIO_CUSTOM_BGM_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE);
if (g_extern.lifecycle_menu_state & (1 << MODE_AUDIO_CUSTOM_BGM_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE))
cellSysutilEnableBgmPlayback(); cellSysutilEnableBgmPlayback();
else else
cellSysutilDisableBgmPlayback(); cellSysutilDisableBgmPlayback();
@ -1501,7 +1501,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
#if(CELL_SDK_VERSION > 0x340000) #if(CELL_SDK_VERSION > 0x340000)
g_extern.lifecycle_menu_state |= (1 << MODE_AUDIO_CUSTOM_BGM_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE);
#endif #endif
} }
break; break;
@ -1984,18 +1984,18 @@ int ingame_menu_resize(void *data, void *state)
if (input & (1ULL << RMENU_DEVICE_NAV_A)) if (input & (1ULL << RMENU_DEVICE_NAV_A))
{ {
menu_stack_pop(); menu_stack_pop();
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW);
} }
if((input & (1ULL << RMENU_DEVICE_NAV_Y))) if((input & (1ULL << RMENU_DEVICE_NAV_Y)))
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_DRAW))
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_DRAW);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW);
} }
if(g_extern.lifecycle_menu_state & (1 << MODE_MENU_DRAW)) if(g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_DRAW))
{ {
char viewport_x[32], viewport_y[32], viewport_w[32], viewport_h[32]; char viewport_x[32], viewport_y[32], viewport_w[32], viewport_h[32];
char msg[256]; char msg[256];
@ -2078,14 +2078,14 @@ int ingame_menu_screenshot(void *data, void *state)
DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data; DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
filebrowser_t *filebrowser = NULL; filebrowser_t *filebrowser = NULL;
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_DRAW);
if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_INGAME)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME))
{ {
if (input & (1ULL << RMENU_DEVICE_NAV_A)) if (input & (1ULL << RMENU_DEVICE_NAV_A))
{ {
menu_stack_pop(); menu_stack_pop();
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_B)) if(input & (1ULL << RMENU_DEVICE_NAV_B))
@ -2124,7 +2124,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_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
return -1; return -1;
} }
@ -2134,7 +2134,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_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
return -1; return -1;
} }
if(input & (1ULL << RMENU_DEVICE_NAV_LEFT)) if(input & (1ULL << RMENU_DEVICE_NAV_LEFT))
@ -2148,7 +2148,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_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
return -1; return -1;
} }
@ -2228,7 +2228,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_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
return -1; return -1;
} }
@ -2238,7 +2238,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_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
return -1; return -1;
} }
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));
@ -2248,7 +2248,7 @@ int ingame_menu(void *data, void *state)
{ {
menu_idx = 0; menu_idx = 0;
/* TODO */ /* TODO */
g_extern.lifecycle_menu_state |= (1 << MODE_MENU); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU);
return -1; return -1;
} }
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));
@ -2268,9 +2268,9 @@ 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_menu_state &= ~(1 << MODE_EMULATION); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION);
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
g_extern.lifecycle_menu_state |= (1 << MODE_EXITSPAWN); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXITSPAWN);
return -1; return -1;
} }
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));
@ -2279,8 +2279,8 @@ 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_menu_state &= ~(1 << MODE_EMULATION); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION);
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
return -1; return -1;
} }
@ -2306,7 +2306,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_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
return -1; return -1;
} }
@ -2432,13 +2432,13 @@ int rmenu_input_process(void *data, void *state)
DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data; DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
rmenu_state_t *rstate = (rmenu_state_t*)state; rmenu_state_t *rstate = (rmenu_state_t*)state;
if (g_extern.lifecycle_menu_state & (1 << MODE_LOAD_GAME)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME))
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_LOADING_ROM, 100); rmenu_settings_msg(S_MSG_LOADING_ROM, 100);
g_extern.lifecycle_menu_state |= (1 << MODE_INIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_INIT);
g_extern.lifecycle_menu_state &= ~(1 << MODE_LOAD_GAME); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME);
return -1; return -1;
} }
@ -2448,7 +2448,7 @@ int rmenu_input_process(void *data, void *state)
if (return_to_game_enable) if (return_to_game_enable)
{ {
g_extern.lifecycle_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
return -1; return -1;
} }
} }
@ -2460,7 +2460,7 @@ int rmenu_input_process(void *data, void *state)
if (quit) if (quit)
{ {
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
return -1; return -1;
} }
@ -2524,15 +2524,15 @@ bool rmenu_iterate(void)
DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data; DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
menu current_menu; menu current_menu;
if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_PREINIT)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_PREINIT))
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_INGAME)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME))
menu_stack_push(INGAME_MENU); menu_stack_push(INGAME_MENU);
menu_stack_force_refresh(); menu_stack_force_refresh();
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW);
device_ptr->ctx_driver->rmenu_init(); device_ptr->ctx_driver->rmenu_init();
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_PREINIT); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_PREINIT);
} }
g_extern.frame_count++; g_extern.frame_count++;
@ -2542,7 +2542,7 @@ bool rmenu_iterate(void)
rmenu_default_positions_t default_pos; rmenu_default_positions_t default_pos;
device_ptr->ctx_driver->rmenu_set_default_pos(&default_pos); device_ptr->ctx_driver->rmenu_set_default_pos(&default_pos);
if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_DRAW))
device_ptr->ctx_driver->set_blend(true); device_ptr->ctx_driver->set_blend(true);
rarch_render_cached_frame(); rarch_render_cached_frame();
@ -2577,12 +2577,12 @@ bool rmenu_iterate(void)
msg = msg_queue_pull(g_extern.msg_queue); msg = msg_queue_pull(g_extern.msg_queue);
if (msg && (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))) if (msg && (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)))
device_ptr->font_ctx->render_msg_place(device_ptr,default_pos.msg_queue_x_position, default_pos.msg_queue_y_position, default_pos.msg_queue_font_size, WHITE, msg); device_ptr->font_ctx->render_msg_place(device_ptr,default_pos.msg_queue_x_position, default_pos.msg_queue_y_position, default_pos.msg_queue_font_size, WHITE, msg);
device_ptr->ctx_driver->swap_buffers(); device_ptr->ctx_driver->swap_buffers();
if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_DRAW))
device_ptr->ctx_driver->set_blend(false); device_ptr->ctx_driver->set_blend(false);
if (input_entry_ret != 0 || input_process_ret != 0) if (input_entry_ret != 0 || input_process_ret != 0)
@ -2596,13 +2596,13 @@ deinit:
if (!(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE))) if (!(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE)))
g_extern.delay_timer[0] = g_extern.frame_count + 30; g_extern.delay_timer[0] = g_extern.frame_count + 30;
if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_INGAME)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME))
{ {
menu_stack_pop(); menu_stack_pop();
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_INGAME); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_INGAME);
} }
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_DRAW);
device_ptr->ctx_driver->rmenu_free(); device_ptr->ctx_driver->rmenu_free();

20
frontend/menu/rmenu_gx.c
View File

@ -168,15 +168,15 @@ static uint16_t trigger_state = 0;
int rmenu_input_process(void *data, void *state) int rmenu_input_process(void *data, void *state)
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_LOAD_GAME)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME))
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_LOADING_ROM, 100); rmenu_settings_msg(S_MSG_LOADING_ROM, 100);
if (g_extern.fullpath) if (g_extern.fullpath)
g_extern.lifecycle_menu_state |= (1 << MODE_INIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_INIT);
g_extern.lifecycle_menu_state &= ~(1 << MODE_LOAD_GAME); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME);
return -1; return -1;
} }
@ -187,14 +187,14 @@ int rmenu_input_process(void *data, void *state)
if (return_to_game_enable) if (return_to_game_enable)
{ {
g_extern.lifecycle_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
return -1; return -1;
} }
if (quit_key_pressed) if (quit_key_pressed)
{ {
g_extern.lifecycle_menu_state &= ~((1 << MODE_EMULATION)); g_extern.lifecycle_mode_state &= ~((1ULL << MODE_EMULATION));
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
return -1; return -1;
} }
} }
@ -208,7 +208,7 @@ bool rmenu_iterate(void)
static bool initial_held = true; static bool initial_held = true;
static bool first_held = false; static bool first_held = false;
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW);
driver.video->apply_state_changes(); driver.video->apply_state_changes();
g_extern.frame_count++; g_extern.frame_count++;
@ -288,8 +288,8 @@ deinit:
if (!(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE))) if (!(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE)))
g_extern.delay_timer[0] = g_extern.frame_count + 30; g_extern.delay_timer[0] = g_extern.frame_count + 30;
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_DRAW);
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_INGAME); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_INGAME);
return false; return false;
} }

40
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_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
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;
@ -61,15 +61,15 @@ void rmenu_settings_set(unsigned setting)
break; break;
case S_OVERSCAN_DECREMENT: case S_OVERSCAN_DECREMENT:
g_extern.console.screen.overscan_amount -= 0.01f; g_extern.console.screen.overscan_amount -= 0.01f;
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_OVERSCAN_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_OVERSCAN_ENABLE);
if(g_extern.console.screen.overscan_amount == 0.0f) if(g_extern.console.screen.overscan_amount == 0.0f)
g_extern.lifecycle_menu_state &= ~(1 << MODE_VIDEO_OVERSCAN_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_OVERSCAN_ENABLE);
break; break;
case S_OVERSCAN_INCREMENT: case S_OVERSCAN_INCREMENT:
g_extern.console.screen.overscan_amount += 0.01f; g_extern.console.screen.overscan_amount += 0.01f;
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_OVERSCAN_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_OVERSCAN_ENABLE);
if(g_extern.console.screen.overscan_amount == 0.0f) if(g_extern.console.screen.overscan_amount == 0.0f)
g_extern.lifecycle_menu_state &= ~(1 << MODE_VIDEO_OVERSCAN_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_OVERSCAN_ENABLE);
break; break;
case S_RESOLUTION_PREVIOUS: case S_RESOLUTION_PREVIOUS:
if (g_extern.console.screen.resolutions.current.idx) if (g_extern.console.screen.resolutions.current.idx)
@ -117,17 +117,17 @@ void rmenu_settings_set(unsigned setting)
case S_THROTTLE: case S_THROTTLE:
if(!g_extern.system.force_nonblock) if(!g_extern.system.force_nonblock)
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_THROTTLE_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_THROTTLE_ENABLE))
g_extern.lifecycle_menu_state &= ~(1 << MODE_VIDEO_THROTTLE_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_THROTTLE_ENABLE);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_THROTTLE_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_THROTTLE_ENABLE);
} }
break; break;
case S_TRIPLE_BUFFERING: case S_TRIPLE_BUFFERING:
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE))
g_extern.lifecycle_menu_state &= ~(1 << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE);
break; break;
} }
} }
@ -159,17 +159,17 @@ void rmenu_settings_set_default(unsigned setting)
break; break;
case S_DEF_OVERSCAN: case S_DEF_OVERSCAN:
g_extern.console.screen.overscan_amount = 0.0f; g_extern.console.screen.overscan_amount = 0.0f;
g_extern.lifecycle_menu_state &= ~(1 << MODE_VIDEO_OVERSCAN_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_OVERSCAN_ENABLE);
break; break;
case S_DEF_ROTATION: case S_DEF_ROTATION:
g_extern.console.screen.orientation = ORIENTATION_NORMAL; g_extern.console.screen.orientation = ORIENTATION_NORMAL;
break; break;
case S_DEF_THROTTLE: case S_DEF_THROTTLE:
if(!g_extern.system.force_nonblock) if(!g_extern.system.force_nonblock)
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_THROTTLE_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_THROTTLE_ENABLE);
break; break;
case S_DEF_TRIPLE_BUFFERING: case S_DEF_TRIPLE_BUFFERING:
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE);
break; break;
case S_DEF_SAVE_STATE: case S_DEF_SAVE_STATE:
g_extern.state_slot = 0; g_extern.state_slot = 0;
@ -202,12 +202,12 @@ void rmenu_settings_msg(unsigned setting, unsigned delay)
snprintf(str, sizeof(str), "INFO - Press LEFT/RIGHT to change the controls, and press\n[RetroPad Start] to reset a button to default values."); snprintf(str, sizeof(str), "INFO - Press LEFT/RIGHT to change the controls, and press\n[RetroPad Start] to reset a button to default values.");
break; break;
case S_MSG_EXTRACTED_ZIPFILE: case S_MSG_EXTRACTED_ZIPFILE:
if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR))
snprintf(str, sizeof(str), "INFO - ZIP file successfully extracted to current directory."); snprintf(str, sizeof(str), "INFO - ZIP file successfully extracted to current directory.");
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE))
snprintf(str, sizeof(str), "INFO - ZIP file successfully extracted, now loading first file."); snprintf(str, sizeof(str), "INFO - ZIP file successfully extracted, now loading first file.");
#ifdef HAVE_HDD_CACHE_PARTITION #ifdef HAVE_HDD_CACHE_PARTITION
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CACHEDIR)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CACHEDIR))
snprintf(str, sizeof(str), "INFO - ZIP file successfully extracted to cache partition."); snprintf(str, sizeof(str), "INFO - ZIP file successfully extracted to cache partition.");
#endif #endif
break; break;
@ -281,12 +281,12 @@ void rmenu_settings_create_menu_item_label(char * str, unsigned setting, size_t
snprintf(str, size, "Save State #%d", g_extern.state_slot); snprintf(str, size, "Save State #%d", g_extern.state_slot);
break; break;
case S_LBL_ZIP_EXTRACT: case S_LBL_ZIP_EXTRACT:
if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR))
snprintf(str, sizeof(size), "INFO - ZIP Extract: Current dir."); snprintf(str, sizeof(size), "INFO - ZIP Extract: Current dir.");
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE))
snprintf(str, sizeof(size), "INFO - ZIP Extract: Current dir and load first file."); snprintf(str, sizeof(size), "INFO - ZIP Extract: Current dir and load first file.");
#ifdef HAVE_HDD_CACHE_PARTITION #ifdef HAVE_HDD_CACHE_PARTITION
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CACHEDIR)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CACHEDIR))
snprintf(str, sizeof(size), "INFO - ZIP Extract: Cache dir."); snprintf(str, sizeof(size), "INFO - ZIP Extract: Cache dir.");
#endif #endif
break; break;

208
frontend/menu/rmenu_xui.cpp
View File

@ -206,7 +206,7 @@ HRESULT CRetroArchFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle
uint64_t action = (1ULL << RMENU_DEVICE_NAV_B); uint64_t action = (1ULL << RMENU_DEVICE_NAV_B);
filebrowser_fetch_directory_entries(browser, action, &m_romlist, &m_rompathtitle); filebrowser_fetch_directory_entries(browser, action, &m_romlist, &m_rompathtitle);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_CACHE_PARTITION, S_DELAY_180); rmenu_settings_msg(S_MSG_CACHE_PARTITION, S_DELAY_180);
} }
#endif #endif
@ -384,9 +384,9 @@ HRESULT CRetroArchSettings::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
GetChildById(L"XuiBackButton", &m_back); GetChildById(L"XuiBackButton", &m_back);
m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF"); m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF");
m_settingslist.SetText(SETTING_EMU_SHOW_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) ? L"Info messages: ON" : L"Info messages: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) ? L"Info messages: ON" : L"Info messages: OFF");
m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF");
m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD"); m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD");
m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF"); m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF");
m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER, g_settings.video.smooth ? L"Hardware filtering shader #1: Linear interpolation" : L"Hardware filtering shader #1: Point filtering"); m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER, g_settings.video.smooth ? L"Hardware filtering shader #1: Linear interpolation" : L"Hardware filtering shader #1: Point filtering");
m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER_2, g_settings.video.second_pass_smooth ? L"Hardware filtering shader #2: Linear interpolation" : L"Hardware filtering shader #2: Point filtering"); m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER_2, g_settings.video.second_pass_smooth ? L"Hardware filtering shader #2: Linear interpolation" : L"Hardware filtering shader #2: Point filtering");
@ -420,59 +420,59 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
rmenu_settings_set(S_REWIND); rmenu_settings_set(S_REWIND);
m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF"); m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF");
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break; break;
case SETTING_EMU_SHOW_INFO_MSG: case SETTING_EMU_SHOW_INFO_MSG:
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
g_extern.lifecycle_menu_state &= ~(1 << MODE_INFO_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INFO_DRAW);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_INFO_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_INFO_DRAW);
m_settingslist.SetText(SETTING_EMU_SHOW_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) ? L"Info messages: ON" : L"Info messages: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) ? L"Info messages: ON" : L"Info messages: OFF");
break; break;
case SETTING_EMU_SHOW_DEBUG_INFO_MSG: case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
if (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW))
g_extern.lifecycle_menu_state &= ~(1 << MODE_FPS_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_FPS_DRAW);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_FPS_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_FPS_DRAW);
m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF");
break; break;
case SETTING_EMU_MENUS: case SETTING_EMU_MENUS:
if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD))
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_HD); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_HD);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_HD); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_HD);
m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD"); m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD");
break; break;
case SETTING_GAMMA_CORRECTION_ENABLED: case SETTING_GAMMA_CORRECTION_ENABLED:
g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1; g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1;
m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF"); m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF");
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break; break;
case SETTING_SHADER: case SETTING_SHADER:
g_extern.lifecycle_menu_state |= (1 << MODE_LOAD_FIRST_SHADER); g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_FIRST_SHADER);
hr = XuiSceneCreate((g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"rarch_shader_browser.xur", NULL, &app.hShaderBrowser); hr = XuiSceneCreate((g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"rarch_shader_browser.xur", NULL, &app.hShaderBrowser);
if (hr < 0) if (hr < 0)
RARCH_ERR("Failed to load scene.\n"); RARCH_ERR("Failed to load scene.\n");
hCur = app.hShaderBrowser; hCur = app.hShaderBrowser;
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_SELECT_SHADER, S_DELAY_180); rmenu_settings_msg(S_MSG_SELECT_SHADER, S_DELAY_180);
NavigateForward(app.hShaderBrowser); NavigateForward(app.hShaderBrowser);
break; break;
case SETTING_SHADER_2: case SETTING_SHADER_2:
g_extern.lifecycle_menu_state |= (1 << MODE_LOAD_SECOND_SHADER); g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_SECOND_SHADER);
hr = XuiSceneCreate((g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"rarch_shader_browser.xur", NULL, &app.hShaderBrowser); hr = XuiSceneCreate((g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"rarch_shader_browser.xur", NULL, &app.hShaderBrowser);
if (hr < 0) if (hr < 0)
RARCH_ERR("Failed to load scene.\n"); RARCH_ERR("Failed to load scene.\n");
hCur = app.hShaderBrowser; hCur = app.hShaderBrowser;
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_SELECT_SHADER, S_DELAY_180); rmenu_settings_msg(S_MSG_SELECT_SHADER, S_DELAY_180);
NavigateForward(app.hShaderBrowser); NavigateForward(app.hShaderBrowser);
@ -495,15 +495,15 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
device_ptr->ctx_driver->set_fbo(FBO_DEINIT); device_ptr->ctx_driver->set_fbo(FBO_DEINIT);
break; break;
case SETTING_ZIP_EXTRACT: case SETTING_ZIP_EXTRACT:
if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR))
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_UNZIP_TO_CURDIR); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_UNZIP_TO_CURDIR);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
} }
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE))
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CACHEDIR); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CACHEDIR);
} }
rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ZIP_EXTRACT, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ZIP_EXTRACT, sizeof(strw_buffer));
m_settingslist.SetText(SETTING_ZIP_EXTRACT, strw_buffer); m_settingslist.SetText(SETTING_ZIP_EXTRACT, strw_buffer);
@ -531,34 +531,34 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
rmenu_settings_set(S_REWIND); rmenu_settings_set(S_REWIND);
m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF"); m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF");
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break; break;
case SETTING_EMU_SHOW_INFO_MSG: case SETTING_EMU_SHOW_INFO_MSG:
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
g_extern.lifecycle_menu_state &= ~(1 << MODE_INFO_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INFO_DRAW);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_INFO_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_INFO_DRAW);
m_settingslist.SetText(SETTING_EMU_SHOW_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) ? L"Info messages: ON" : L"Info messages: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) ? L"Info messages: ON" : L"Info messages: OFF");
break; break;
case SETTING_EMU_SHOW_DEBUG_INFO_MSG: case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
if (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW))
g_extern.lifecycle_menu_state &= ~(1 << MODE_FPS_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_FPS_DRAW);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_FPS_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_FPS_DRAW);
m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF");
break; break;
case SETTING_EMU_MENUS: case SETTING_EMU_MENUS:
if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD))
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_HD); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_HD);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_HD); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_HD);
m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD"); m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD");
break; break;
case SETTING_GAMMA_CORRECTION_ENABLED: case SETTING_GAMMA_CORRECTION_ENABLED:
g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1; g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1;
m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF"); m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF");
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break; break;
case SETTING_SCALE_FACTOR: case SETTING_SCALE_FACTOR:
@ -574,15 +574,15 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
} }
break; break;
case SETTING_ZIP_EXTRACT: case SETTING_ZIP_EXTRACT:
if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CACHEDIR)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CACHEDIR))
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_UNZIP_TO_CACHEDIR); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_UNZIP_TO_CACHEDIR);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
} }
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE))
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR);
} }
rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ZIP_EXTRACT, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ZIP_EXTRACT, sizeof(strw_buffer));
m_settingslist.SetText(SETTING_ZIP_EXTRACT, strw_buffer); m_settingslist.SetText(SETTING_ZIP_EXTRACT, strw_buffer);
@ -611,37 +611,37 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
switch(current_index) switch(current_index)
{ {
case SETTING_EMU_SHOW_INFO_MSG: case SETTING_EMU_SHOW_INFO_MSG:
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
g_extern.lifecycle_menu_state &= ~(1 << MODE_INFO_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INFO_DRAW);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_INFO_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_INFO_DRAW);
m_settingslist.SetText(SETTING_EMU_SHOW_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) ? L"Info messages: ON" : L"Info messages: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) ? L"Info messages: ON" : L"Info messages: OFF");
break; break;
case SETTING_EMU_SHOW_DEBUG_INFO_MSG: case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
if (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW))
g_extern.lifecycle_menu_state &= ~(1 << MODE_FPS_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_FPS_DRAW);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_FPS_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_FPS_DRAW);
m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF");
break; break;
case SETTING_EMU_MENUS: case SETTING_EMU_MENUS:
if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD))
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_HD); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_HD);
else else
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_HD); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_HD);
m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD"); m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD");
break; break;
case SETTING_GAMMA_CORRECTION_ENABLED: case SETTING_GAMMA_CORRECTION_ENABLED:
g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1; g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1;
m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF"); m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF");
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break; break;
case SETTING_EMU_REWIND_ENABLED: case SETTING_EMU_REWIND_ENABLED:
rmenu_settings_set(S_REWIND); rmenu_settings_set(S_REWIND);
m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF"); m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF");
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break; break;
case SETTING_SCALE_FACTOR: case SETTING_SCALE_FACTOR:
@ -657,15 +657,15 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
} }
break; break;
case SETTING_ZIP_EXTRACT: case SETTING_ZIP_EXTRACT:
if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR))
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_UNZIP_TO_CURDIR); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_UNZIP_TO_CURDIR);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
} }
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE))
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CACHEDIR); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CACHEDIR);
} }
rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ZIP_EXTRACT, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ZIP_EXTRACT, sizeof(strw_buffer));
m_settingslist.SetText(SETTING_ZIP_EXTRACT, strw_buffer); m_settingslist.SetText(SETTING_ZIP_EXTRACT, strw_buffer);
@ -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_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
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_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
process_input_ret = -1; process_input_ret = -1;
} }
break; break;
@ -856,7 +856,7 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
m_quickmenulist.SetText(MENU_ITEM_KEEP_ASPECT_RATIO, strw_buffer); m_quickmenulist.SetText(MENU_ITEM_KEEP_ASPECT_RATIO, strw_buffer);
break; break;
case MENU_ITEM_OVERSCAN_AMOUNT: case MENU_ITEM_OVERSCAN_AMOUNT:
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_NOT_IMPLEMENTED, S_DELAY_180); rmenu_settings_msg(S_MSG_NOT_IMPLEMENTED, S_DELAY_180);
break; break;
case MENU_ITEM_ORIENTATION: case MENU_ITEM_ORIENTATION:
@ -868,7 +868,7 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
case MENU_ITEM_RESIZE_MODE: case MENU_ITEM_RESIZE_MODE:
input_loop = INPUT_LOOP_RESIZE_MODE; input_loop = INPUT_LOOP_RESIZE_MODE;
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_RESIZE_SCREEN, S_DELAY_270); rmenu_settings_msg(S_MSG_RESIZE_SCREEN, S_DELAY_270);
break; break;
case MENU_ITEM_FRAME_ADVANCE: case MENU_ITEM_FRAME_ADVANCE:
@ -880,27 +880,27 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
} }
break; break;
case MENU_ITEM_SCREENSHOT_MODE: case MENU_ITEM_SCREENSHOT_MODE:
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
device_ptr->ctx_driver->rmenu_screenshot_dump(NULL); device_ptr->ctx_driver->rmenu_screenshot_dump(NULL);
break; break;
case MENU_ITEM_RESET: case MENU_ITEM_RESET:
if (g_extern.main_is_init) if (g_extern.main_is_init)
{ {
rarch_game_reset(); rarch_game_reset();
g_extern.lifecycle_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
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_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
process_input_ret = -1; process_input_ret = -1;
} }
break; break;
case MENU_ITEM_QUIT_RARCH: case MENU_ITEM_QUIT_RARCH:
g_extern.lifecycle_menu_state &= ~(1 << MODE_EMULATION); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION);
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
process_input_ret = -1; process_input_ret = -1;
break; break;
} }
@ -936,32 +936,32 @@ HRESULT CRetroArchShaderBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHand
{ {
convert_wchar_to_char(str_buffer, (const wchar_t *)m_shaderlist.GetText(index), sizeof(str_buffer)); convert_wchar_to_char(str_buffer, (const wchar_t *)m_shaderlist.GetText(index), sizeof(str_buffer));
if (g_extern.lifecycle_menu_state & (1 << MODE_LOAD_FIRST_SHADER)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_FIRST_SHADER))
{ {
snprintf(g_settings.video.cg_shader_path, sizeof(g_settings.video.cg_shader_path), "%s\\%s", filebrowser_get_current_dir(tmp_browser), str_buffer); snprintf(g_settings.video.cg_shader_path, sizeof(g_settings.video.cg_shader_path), "%s\\%s", filebrowser_get_current_dir(tmp_browser), str_buffer);
if (g_settings.video.shader_type != RARCH_SHADER_NONE) if (g_settings.video.shader_type != RARCH_SHADER_NONE)
{ {
driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, g_settings.video.cg_shader_path, RARCH_SHADER_INDEX_PASS0); driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, g_settings.video.cg_shader_path, RARCH_SHADER_INDEX_PASS0);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180);
} }
else else
RARCH_ERR("Shaders are unsupported on this platform.\n"); RARCH_ERR("Shaders are unsupported on this platform.\n");
g_extern.lifecycle_menu_state &= ~(1 << MODE_LOAD_FIRST_SHADER); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_FIRST_SHADER);
} }
if (g_extern.lifecycle_menu_state & (1 << MODE_LOAD_SECOND_SHADER)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_SECOND_SHADER))
{ {
snprintf (g_settings.video.second_pass_shader, sizeof(g_settings.video.second_pass_shader), "%s\\%s", filebrowser_get_current_dir(tmp_browser), str_buffer); snprintf (g_settings.video.second_pass_shader, sizeof(g_settings.video.second_pass_shader), "%s\\%s", filebrowser_get_current_dir(tmp_browser), str_buffer);
if (g_settings.video.shader_type != RARCH_SHADER_NONE) if (g_settings.video.shader_type != RARCH_SHADER_NONE)
{ {
driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, g_settings.video.second_pass_shader, RARCH_SHADER_INDEX_PASS1); driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, g_settings.video.second_pass_shader, RARCH_SHADER_INDEX_PASS1);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180);
} }
else else
RARCH_ERR("Shaders are unsupported on this platform.\n"); RARCH_ERR("Shaders are unsupported on this platform.\n");
g_extern.lifecycle_menu_state &= ~(1 << MODE_LOAD_SECOND_SHADER); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_SECOND_SHADER);
} }
} }
else if(tmp_browser->current_dir.list->elems[index].attr.b) else if(tmp_browser->current_dir.list->elems[index].attr.b)
@ -1005,8 +1005,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.fullpath, sizeof(g_extern.fullpath), "%s\\%s", filebrowser_get_current_dir(tmp_browser), str_buffer); snprintf(g_extern.fullpath, sizeof(g_extern.fullpath), "%s\\%s", filebrowser_get_current_dir(tmp_browser), str_buffer);
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
g_extern.lifecycle_menu_state |= (1 << MODE_EXITSPAWN); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXITSPAWN);
process_input_ret = -1; process_input_ret = -1;
} }
else if(tmp_browser->current_dir.list->elems[index].attr.b) else if(tmp_browser->current_dir.list->elems[index].attr.b)
@ -1046,7 +1046,7 @@ HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
{ {
xdk_d3d_video_t *vid = (xdk_d3d_video_t*)driver.video_data; xdk_d3d_video_t *vid = (xdk_d3d_video_t*)driver.video_data;
bool hdmenus_allowed = (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)); bool hdmenus_allowed = (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD));
HRESULT hr; HRESULT hr;
@ -1080,7 +1080,7 @@ HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
hCur = app.hControlsMenu; hCur = app.hControlsMenu;
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_CHANGE_CONTROLS, S_DELAY_180); rmenu_settings_msg(S_MSG_CHANGE_CONTROLS, S_DELAY_180);
NavigateForward(app.hControlsMenu); NavigateForward(app.hControlsMenu);
@ -1093,7 +1093,7 @@ HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
RARCH_ERR("Failed to load scene.\n"); RARCH_ERR("Failed to load scene.\n");
hCur = app.hCoreBrowser; hCur = app.hCoreBrowser;
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_SELECT_LIBRETRO_CORE, S_DELAY_180); rmenu_settings_msg(S_MSG_SELECT_LIBRETRO_CORE, S_DELAY_180);
NavigateForward(app.hCoreBrowser); NavigateForward(app.hCoreBrowser);
@ -1110,8 +1110,8 @@ HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
} }
else if (hObjPressed == m_quit) else if (hObjPressed == m_quit)
{ {
g_extern.lifecycle_menu_state &= ~(1 << MODE_EMULATION); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_EMULATION);
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
process_input_ret = -1; process_input_ret = -1;
} }
@ -1125,7 +1125,7 @@ void menu_init (void)
xdk_d3d_video_t *device_ptr = (xdk_d3d_video_t*)driver.video_data; xdk_d3d_video_t *device_ptr = (xdk_d3d_video_t*)driver.video_data;
bool hdmenus_allowed = (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)); bool hdmenus_allowed = (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD));
if (hdmenus_allowed) if (hdmenus_allowed)
RARCH_LOG("HD menus enabled.\n"); RARCH_LOG("HD menus enabled.\n");
@ -1234,11 +1234,11 @@ bool rmenu_iterate(void)
xdk_d3d_video_t *device_ptr = (xdk_d3d_video_t*)driver.video_data; xdk_d3d_video_t *device_ptr = (xdk_d3d_video_t*)driver.video_data;
if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_PREINIT)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_PREINIT))
{ {
input_loop = INPUT_LOOP_MENU; input_loop = INPUT_LOOP_MENU;
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW);
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_PREINIT); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_PREINIT);
} }
g_extern.frame_count++; g_extern.frame_count++;
@ -1246,13 +1246,13 @@ bool rmenu_iterate(void)
XINPUT_STATE state; XINPUT_STATE state;
XInputGetState(0, &state); XInputGetState(0, &state);
if (g_extern.lifecycle_menu_state & (1 << MODE_LOAD_GAME)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME))
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_LOADING_ROM, 100); rmenu_settings_msg(S_MSG_LOADING_ROM, 100);
g_extern.lifecycle_menu_state |= (1 << MODE_INIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_INIT);
g_extern.lifecycle_menu_state &= ~(1 << MODE_LOAD_GAME); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME);
process_input_ret = -1; process_input_ret = -1;
} }
@ -1262,10 +1262,10 @@ bool rmenu_iterate(void)
bool rmenu_enable = ((state.Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_THUMB) bool rmenu_enable = ((state.Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_THUMB)
&& (state.Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_THUMB) && (g_extern.main_is_init)); && (state.Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_THUMB) && (g_extern.main_is_init));
if (g_extern.lifecycle_menu_state & (1 << MODE_MENU)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU))
if (rmenu_enable) if (rmenu_enable)
{ {
g_extern.lifecycle_menu_state |= (1 << MODE_EMULATION); g_extern.lifecycle_mode_state |= (1ULL << MODE_EMULATION);
process_input_ret = -1; process_input_ret = -1;
} }
} }
@ -1305,8 +1305,8 @@ deinit:
if(!(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE))) if(!(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE)))
g_extern.delay_timer[0] = g_extern.frame_count + 30; g_extern.delay_timer[0] = g_extern.frame_count + 30;
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_INGAME); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_INGAME);
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_DRAW);
process_input_ret = 0; process_input_ret = 0;

18
frontend/platform/platform_gx.c
View File

@ -369,23 +369,23 @@ static void system_process_args(int argc, char *argv[])
if (argc > 2 && argv[1] != NULL && argv[2] != NULL) if (argc > 2 && argv[1] != NULL && argv[2] != NULL)
{ {
char rom[PATH_MAX]; char rom[PATH_MAX];
g_extern.lifecycle_menu_state &= ~((1 << MODE_UNZIP_TO_CURDIR) | g_extern.lifecycle_mode_state &= ~((1ULL << MODE_UNZIP_TO_CURDIR) |
(1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE) | (1 << MODE_UNZIP_TO_CACHEDIR)); (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE) | (1ULL << MODE_UNZIP_TO_CACHEDIR));
g_extern.lifecycle_menu_state |= (1 << MODE_EXTLAUNCH_CHANNEL); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXTLAUNCH_CHANNEL);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
snprintf(rom, sizeof(rom), "%s%s", argv[1], argv[2]); snprintf(rom, sizeof(rom), "%s%s", argv[1], argv[2]);
console_load_game(rom); console_load_game(rom);
rgui_iterate(rgui, RGUI_ACTION_MESSAGE); rgui_iterate(rgui, RGUI_ACTION_MESSAGE);
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW);
rarch_render_cached_frame(); rarch_render_cached_frame();
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_DRAW);
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU);
g_extern.lifecycle_menu_state |= (1 << MODE_INIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_INIT);
} }
else else
g_extern.lifecycle_menu_state |= (1 << MODE_EXTLAUNCH_SALAMANDER); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXTLAUNCH_SALAMANDER);
} }
#endif #endif

22
frontend/platform/platform_ps3.c
View File

@ -155,8 +155,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;
g_extern.lifecycle_menu_state &= ~((1 << MODE_MENU) | (1 << MODE_MENU_INGAME) | (1 << MODE_EMULATION)); g_extern.lifecycle_mode_state &= ~((1ULL << MODE_MENU) | (1ULL << MODE_MENU_INGAME) | (1ULL << MODE_EMULATION));
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
break; break;
#ifdef HAVE_OSKUTIL #ifdef HAVE_OSKUTIL
case CELL_SYSUTIL_OSKDIALOG_FINISHED: case CELL_SYSUTIL_OSKDIALOG_FINISHED:
@ -217,14 +217,14 @@ static void get_environment_settings(int argc, char *argv[])
if(path_file_exists(default_paths.multiman_self_file) && argc > 1 && path_file_exists(argv[1])) if(path_file_exists(default_paths.multiman_self_file) && argc > 1 && path_file_exists(argv[1]))
{ {
g_extern.lifecycle_menu_state |= (1 << 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");
} }
else else
#endif #endif
#ifndef IS_SALAMANDER #ifndef IS_SALAMANDER
{ {
g_extern.lifecycle_menu_state |= (1 << MODE_EXTLAUNCH_SALAMANDER); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXTLAUNCH_SALAMANDER);
RARCH_WARN("Started from Salamander, auto-game start disabled.\n"); RARCH_WARN("Started from Salamander, auto-game start disabled.\n");
} }
#endif #endif
@ -258,7 +258,7 @@ static void get_environment_settings(int argc, char *argv[])
ret = cellGameContentPermit(contentInfoPath, default_paths.port_dir); ret = cellGameContentPermit(contentInfoPath, default_paths.port_dir);
#ifdef HAVE_MULTIMAN #ifdef HAVE_MULTIMAN
if (g_extern.lifecycle_menu_state & (1 << MODE_EXTLAUNCH_MULTIMAN)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXTLAUNCH_MULTIMAN))
{ {
snprintf(contentInfoPath, sizeof(contentInfoPath), "/dev_hdd0/game/%s", EMULATOR_CONTENT_DIR); snprintf(contentInfoPath, sizeof(contentInfoPath), "/dev_hdd0/game/%s", EMULATOR_CONTENT_DIR);
snprintf(default_paths.port_dir, sizeof(default_paths.port_dir), "/dev_hdd0/game/%s/USRDIR", EMULATOR_CONTENT_DIR); snprintf(default_paths.port_dir, sizeof(default_paths.port_dir), "/dev_hdd0/game/%s/USRDIR", EMULATOR_CONTENT_DIR);
@ -356,7 +356,7 @@ static void system_init(void)
static void system_post_init(void) static void system_post_init(void)
{ {
#if (CELL_SDK_VERSION > 0x340000) && !defined(__PSL1GHT__) #if (CELL_SDK_VERSION > 0x340000) && !defined(__PSL1GHT__)
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_SCREENSHOTS_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE))
{ {
#ifdef HAVE_SYSMODULES #ifdef HAVE_SYSMODULES
cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT); cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT);
@ -371,7 +371,7 @@ static void system_post_init(void)
#endif #endif
} }
#ifdef HAVE_SYSUTILS #ifdef HAVE_SYSUTILS
if (g_extern.lifecycle_menu_state & (1 << MODE_AUDIO_CUSTOM_BGM_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE))
cellSysutilEnableBgmPlayback(); cellSysutilEnableBgmPlayback();
#endif #endif
#endif #endif
@ -385,12 +385,12 @@ static void system_post_init(void)
static void system_process_args(int argc, char *argv[]) static void system_process_args(int argc, char *argv[])
{ {
#ifdef HAVE_MULTIMAN #ifdef HAVE_MULTIMAN
if (g_extern.lifecycle_menu_state & (1 << MODE_EXTLAUNCH_MULTIMAN)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXTLAUNCH_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));
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU);
g_extern.lifecycle_menu_state |= (1 << MODE_INIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_INIT);
} }
#endif #endif
} }
@ -421,7 +421,7 @@ static void system_deinit(void)
#ifndef __PSL1GHT__ #ifndef __PSL1GHT__
/* screenshot PRX */ /* screenshot PRX */
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_SCREENSHOTS_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE))
cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT); cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT);
#endif #endif

4
frontend/platform/platform_psp.c
View File

@ -100,8 +100,8 @@ bool rmenu_iterate(void)
snprintf(game_rom, sizeof(game_rom), "%s%s", default_paths.port_dir, "dkc.sfc"); snprintf(game_rom, sizeof(game_rom), "%s%s", default_paths.port_dir, "dkc.sfc");
RARCH_LOG("game ROM: %s\n", game_rom); RARCH_LOG("game ROM: %s\n", game_rom);
console_load_game(game_rom); console_load_game(game_rom);
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU);
g_extern.lifecycle_menu_state |= (1 << MODE_INIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_INIT);
return false; return false;
} }

2
general.h
View File

@ -566,7 +566,7 @@ struct global
} console; } console;
uint64_t lifecycle_state; uint64_t lifecycle_state;
uint32_t lifecycle_menu_state; uint64_t lifecycle_mode_state;
struct struct
{ {

2
gfx/context/ps3_ctx.c
View File

@ -414,7 +414,7 @@ static bool gfx_ctx_init(void)
params.depthFormat = GL_NONE; params.depthFormat = GL_NONE;
params.multisamplingMode = GL_MULTISAMPLING_NONE_SCE; params.multisamplingMode = GL_MULTISAMPLING_NONE_SCE;
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE))
{ {
params.enable |= PSGL_DEVICE_PARAMETERS_BUFFERING_MODE; params.enable |= PSGL_DEVICE_PARAMETERS_BUFFERING_MODE;
params.bufferingMode = PSGL_BUFFERING_MODE_TRIPLE; params.bufferingMode = PSGL_BUFFERING_MODE_TRIPLE;

28
gfx/context/xdk_ctx.c
View File

@ -299,19 +299,19 @@ static void gfx_ctx_xdk_get_video_size(unsigned *width, unsigned *height)
{ {
*width = 1280; *width = 1280;
*height = 720; *height = 720;
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_HD); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_HD);
} }
else else
{ {
*width = 640; *width = 640;
*height = 480; *height = 480;
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_HD); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_HD);
} }
if(video_mode.fIsWideScreen) if(video_mode.fIsWideScreen)
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_WIDESCREEN); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_WIDESCREEN);
else else
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_WIDESCREEN); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_WIDESCREEN);
#elif defined(_XBOX1) #elif defined(_XBOX1)
DWORD video_mode = XGetVideoFlags(); DWORD video_mode = XGetVideoFlags();
@ -334,10 +334,10 @@ static void gfx_ctx_xdk_get_video_size(unsigned *width, unsigned *height)
*width = 720; *width = 720;
*height = 576; *height = 576;
} }
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_WIDESCREEN); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_WIDESCREEN);
} }
else else
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_WIDESCREEN); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_WIDESCREEN);
} }
else else
{ {
@ -346,10 +346,10 @@ static void gfx_ctx_xdk_get_video_size(unsigned *width, unsigned *height)
{ {
*width = 720; *width = 720;
*height = 480; *height = 480;
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_WIDESCREEN); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_WIDESCREEN);
} }
else else
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_WIDESCREEN); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_WIDESCREEN);
} }
if(XGetAVPack() == XC_AV_PACK_HDTV) if(XGetAVPack() == XC_AV_PACK_HDTV)
@ -358,22 +358,22 @@ static void gfx_ctx_xdk_get_video_size(unsigned *width, unsigned *height)
{ {
*width = 640; *width = 640;
*height = 480; *height = 480;
g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_WIDESCREEN); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_WIDESCREEN);
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_HD); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_HD);
} }
else if(video_mode & XC_VIDEO_FLAGS_HDTV_720p) else if(video_mode & XC_VIDEO_FLAGS_HDTV_720p)
{ {
*width = 1280; *width = 1280;
*height = 720; *height = 720;
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_WIDESCREEN); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_WIDESCREEN);
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_HD); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_HD);
} }
else if(video_mode & XC_VIDEO_FLAGS_HDTV_1080i) else if(video_mode & XC_VIDEO_FLAGS_HDTV_1080i)
{ {
*width = 1920; *width = 1920;
*height = 1080; *height = 1080;
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_WIDESCREEN); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_WIDESCREEN);
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_HD); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_HD);
} }
} }
#else #else

4
gfx/fonts/xdk360_fonts.cpp
View File

@ -19,7 +19,7 @@
#include "../../general.h" #include "../../general.h"
#include "../../xdk/xdk_resources.h" #include "../../xdk/xdk_resources.h"
#define FONT_SCALE ((g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) ? 2 : 1) #define FONT_SCALE ((g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? 2 : 1)
typedef struct GLYPH_ATTR typedef struct GLYPH_ATTR
{ {
@ -460,7 +460,7 @@ static void xdk_render_msg(void *driver, const char *msg)
{ {
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver; xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver;
float x = (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) ? 160 : 100; float x = (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? 160 : 100;
float y = 120; float y = 120;
xdk_render_msg_place(d3d, x, y, 0, 0, msg); xdk_render_msg_place(d3d, x, y, 0, 0, msg);

8
gfx/gl.c
View File

@ -633,7 +633,7 @@ void gl_set_projection(void *data, struct gl_ortho *ortho, bool allow_rotate)
{ {
gl_t *gl = (gl_t*)data; gl_t *gl = (gl_t*)data;
#ifdef RARCH_CONSOLE #ifdef RARCH_CONSOLE
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_OVERSCAN_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_OVERSCAN_ENABLE))
{ {
ortho->left = -g_extern.console.screen.overscan_amount / 2; ortho->left = -g_extern.console.screen.overscan_amount / 2;
ortho->right = 1 + g_extern.console.screen.overscan_amount / 2; ortho->right = 1 + g_extern.console.screen.overscan_amount / 2;
@ -1193,7 +1193,7 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
gl_t *gl = (gl_t*)data; gl_t *gl = (gl_t*)data;
#ifdef HAVE_RMENU #ifdef HAVE_RMENU
unsigned lifecycle_menu_state = g_extern.lifecycle_menu_state; uint64_t lifecycle_mode_state = g_extern.lifecycle_mode_state;
#endif #endif
gl_shader_use_func(gl, 1); gl_shader_use_func(gl, 1);
@ -1260,7 +1260,7 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
gl_set_prev_texture(gl, &tex_info); gl_set_prev_texture(gl, &tex_info);
#ifdef FPS_COUNTER #ifdef FPS_COUNTER
if (lifecycle_menu_state & (1 << MODE_FPS_DRAW)) if (lifecycle_mode_state & (1ULL << MODE_FPS_DRAW))
{ {
char fps_txt[128]; char fps_txt[128];
gfx_get_fps(fps_txt, sizeof(fps_txt), true); gfx_get_fps(fps_txt, sizeof(fps_txt), true);
@ -1287,7 +1287,7 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
RARCH_PERFORMANCE_STOP(frame_run); RARCH_PERFORMANCE_STOP(frame_run);
#ifdef HAVE_RMENU #ifdef HAVE_RMENU
if (lifecycle_menu_state & (1 << MODE_MENU_DRAW)) if (lifecycle_mode_state & (1ULL << MODE_MENU_DRAW))
context_rmenu_frame_func(gl); context_rmenu_frame_func(gl);
else else
#endif #endif

2
gx/gx_input.c
View File

@ -333,7 +333,7 @@ static void gx_input_poll(void *data)
*state_cur |= GX_QUIT_KEY; *state_cur |= GX_QUIT_KEY;
//TODO: Hack, analog stick twitchiness needs to be properly fixed //TODO: Hack, analog stick twitchiness needs to be properly fixed
if(g_extern.lifecycle_menu_state & (1 << MODE_MENU_DRAW)) if(g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_DRAW))
{ {
s8 x = gx_stick_x(exp->classic.ljs); s8 x = gx_stick_x(exp->classic.ljs);
s8 y = gx_stick_y(exp->classic.ljs); s8 y = gx_stick_y(exp->classic.ljs);

22
gx/gx_video.c
View File

@ -303,7 +303,7 @@ static void init_texture(unsigned width, unsigned height)
gx_video_t *gx = (gx_video_t*)driver.video_data; gx_video_t *gx = (gx_video_t*)driver.video_data;
unsigned g_filter = g_settings.video.smooth ? GX_LINEAR : GX_NEAR; unsigned g_filter = g_settings.video.smooth ? GX_LINEAR : GX_NEAR;
GX_InitTexObj(&g_tex.obj, g_tex.data, width, height, (gx->rgb32) ? GX_TF_RGBA8 : (g_extern.lifecycle_menu_state & (1 << MODE_MENU_DRAW)) ? GX_TF_RGB5A3 : GX_TF_RGB565, GX_CLAMP, GX_CLAMP, GX_FALSE); GX_InitTexObj(&g_tex.obj, g_tex.data, width, height, (gx->rgb32) ? GX_TF_RGBA8 : (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_DRAW)) ? GX_TF_RGB5A3 : GX_TF_RGB565, GX_CLAMP, GX_CLAMP, GX_FALSE);
GX_InitTexObjLOD(&g_tex.obj, g_filter, g_filter, 0, 0, 0, GX_TRUE, GX_FALSE, GX_ANISO_1); GX_InitTexObjLOD(&g_tex.obj, g_filter, g_filter, 0, 0, 0, GX_TRUE, GX_FALSE, GX_ANISO_1);
GX_InitTexObj(&menu_tex.obj, menu_tex.data, RGUI_WIDTH, RGUI_HEIGHT, GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, GX_FALSE); GX_InitTexObj(&menu_tex.obj, menu_tex.data, RGUI_WIDTH, RGUI_HEIGHT, GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, GX_FALSE);
GX_InitTexObjLOD(&menu_tex.obj, g_filter, g_filter, 0, 0, 0, GX_TRUE, GX_FALSE, GX_ANISO_1); GX_InitTexObjLOD(&menu_tex.obj, g_filter, g_filter, 0, 0, 0, GX_TRUE, GX_FALSE, GX_ANISO_1);
@ -683,10 +683,10 @@ static void gx_resize(void *data)
int x = 0, y = 0; int x = 0, y = 0;
unsigned width = gx->win_width, height = gx->win_height; unsigned width = gx->win_width, height = gx->win_height;
u32 lifecycle_menu_state = g_extern.lifecycle_menu_state; uint64_t lifecycle_mode_state = g_extern.lifecycle_mode_state;
#ifdef HW_RVL #ifdef HW_RVL
VIDEO_SetTrapFilter(lifecycle_menu_state & (1 << MODE_VIDEO_SOFT_FILTER_ENABLE)); VIDEO_SetTrapFilter(lifecycle_mode_state & (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE));
#endif #endif
GX_SetDispCopyGamma(g_extern.console.screen.gamma_correction); GX_SetDispCopyGamma(g_extern.console.screen.gamma_correction);
@ -748,7 +748,7 @@ static void gx_resize(void *data)
Mtx44 m1, m2; Mtx44 m1, m2;
float top = 1, bottom = -1, left = -1, right = 1; float top = 1, bottom = -1, left = -1, right = 1;
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_OVERSCAN_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_OVERSCAN_ENABLE))
{ {
top -= g_extern.console.screen.overscan_amount / 2; top -= g_extern.console.screen.overscan_amount / 2;
left += g_extern.console.screen.overscan_amount / 2; left += g_extern.console.screen.overscan_amount / 2;
@ -870,7 +870,7 @@ static bool gx_frame(void *data, const void *frame,
gx_video_t *gx = (gx_video_t*)driver.video_data; gx_video_t *gx = (gx_video_t*)driver.video_data;
bool should_resize = gx->should_resize; bool should_resize = gx->should_resize;
u8 clear_efb = GX_FALSE; u8 clear_efb = GX_FALSE;
u32 lifecycle_menu_state = g_extern.lifecycle_menu_state; uint64_t lifecycle_mode_state = g_extern.lifecycle_mode_state;
(void)data; (void)data;
@ -879,7 +879,7 @@ static bool gx_frame(void *data, const void *frame,
else else
gx->msg[0] = 0; gx->msg[0] = 0;
if(!frame && !(lifecycle_menu_state & (1 << MODE_MENU_DRAW))) if(!frame && !(lifecycle_mode_state & (1ULL << MODE_MENU_DRAW)))
return true; return true;
if (!frame) if (!frame)
@ -891,7 +891,7 @@ static bool gx_frame(void *data, const void *frame,
clear_efb = GX_TRUE; clear_efb = GX_TRUE;
} }
while ((g_vsync || (lifecycle_menu_state & (1 << MODE_MENU_DRAW))) && !g_draw_done) while ((g_vsync || (lifecycle_mode_state & (1ULL << MODE_MENU_DRAW))) && !g_draw_done)
LWP_ThreadSleep(g_video_cond); LWP_ThreadSleep(g_video_cond);
if (width != gx_old_width || height != gx_old_height) if (width != gx_old_width || height != gx_old_height)
@ -908,14 +908,14 @@ static bool gx_frame(void *data, const void *frame,
{ {
if (gx->rgb32) if (gx->rgb32)
convert_texture32(frame, g_tex.data, width, height, pitch); convert_texture32(frame, g_tex.data, width, height, pitch);
else if (lifecycle_menu_state & (1 << MODE_MENU_DRAW)) else if (lifecycle_mode_state & (1ULL << MODE_MENU_DRAW))
convert_texture16_conv(frame, g_tex.data, width, height, pitch); convert_texture16_conv(frame, g_tex.data, width, height, pitch);
else else
convert_texture16(frame, g_tex.data, width, height, pitch); convert_texture16(frame, g_tex.data, width, height, pitch);
DCFlushRange(g_tex.data, height * (width << (gx->rgb32 ? 2 : 1))); DCFlushRange(g_tex.data, height * (width << (gx->rgb32 ? 2 : 1)));
} }
if (lifecycle_menu_state & (1 << MODE_MENU_DRAW)) if (lifecycle_mode_state & (1ULL << MODE_MENU_DRAW))
{ {
convert_texture16(gx->menu_data, menu_tex.data, RGUI_WIDTH, RGUI_HEIGHT, RGUI_WIDTH * 2); convert_texture16(gx->menu_data, menu_tex.data, RGUI_WIDTH, RGUI_HEIGHT, RGUI_WIDTH * 2);
DCFlushRange(menu_tex.data, RGUI_WIDTH * RGUI_HEIGHT * 2); DCFlushRange(menu_tex.data, RGUI_WIDTH * RGUI_HEIGHT * 2);
@ -930,14 +930,14 @@ static bool gx_frame(void *data, const void *frame,
GX_DrawDone(); GX_DrawDone();
} }
if(lifecycle_menu_state & (1 << MODE_MENU_DRAW)) if(lifecycle_mode_state & (1ULL << MODE_MENU_DRAW))
{ {
GX_LoadTexObj(&menu_tex.obj, GX_TEXMAP0); GX_LoadTexObj(&menu_tex.obj, GX_TEXMAP0);
GX_CallDispList(display_list, display_list_size); GX_CallDispList(display_list, display_list_size);
GX_DrawDone(); GX_DrawDone();
} }
if (lifecycle_menu_state & (1 << MODE_FPS_DRAW)) if (lifecycle_mode_state & (1ULL << MODE_FPS_DRAW))
{ {
char fps_txt[128]; char fps_txt[128];
char mem1_txt[128]; char mem1_txt[128];

14
retroarch.c
View File

@ -2785,7 +2785,7 @@ bool rarch_main_iterate(void)
if (g_extern.system.shutdown) if (g_extern.system.shutdown)
{ {
#ifdef HAVE_RMENU #ifdef HAVE_RMENU
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
#endif #endif
return false; return false;
} }
@ -2797,15 +2797,15 @@ bool rarch_main_iterate(void)
#ifdef HAVE_RMENU #ifdef HAVE_RMENU
bool rmenu_enable = input_key_pressed_func(RARCH_RMENU_TOGGLE); bool rmenu_enable = input_key_pressed_func(RARCH_RMENU_TOGGLE);
if (input_key_pressed_func(RARCH_RMENU_QUICKMENU_TOGGLE)) if (input_key_pressed_func(RARCH_RMENU_QUICKMENU_TOGGLE))
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_INGAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME);
if (rmenu_enable || ((g_extern.lifecycle_menu_state & (1 << MODE_MENU_INGAME)) && !rmenu_enable)) if (rmenu_enable || ((g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME)) && !rmenu_enable))
{ {
g_extern.lifecycle_menu_state |= (1 << MODE_MENU); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU);
g_extern.delay_timer[0] = g_extern.frame_count + 30; g_extern.delay_timer[0] = g_extern.frame_count + 30;
} }
else else
g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
#endif #endif
return false; return false;
} }
@ -2854,8 +2854,8 @@ bool rarch_main_iterate(void)
if (input_key_pressed_func(RARCH_FRAMEADVANCE)) if (input_key_pressed_func(RARCH_FRAMEADVANCE))
{ {
g_extern.lifecycle_state &= ~(1ULL << RARCH_FRAMEADVANCE); g_extern.lifecycle_state &= ~(1ULL << RARCH_FRAMEADVANCE);
g_extern.lifecycle_menu_state |= (1 << MODE_MENU); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU);
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_INGAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME);
return false; return false;
} }
#endif #endif

86
settings.c
View File

@ -241,8 +241,8 @@ void config_set_defaults(void)
#ifdef RARCH_CONSOLE #ifdef RARCH_CONSOLE
/* TODO - will be refactored - I'm aware this is messy right now */ /* TODO - will be refactored - I'm aware this is messy right now */
g_extern.lifecycle_menu_state = 0; g_extern.lifecycle_mode_state = 0;
g_extern.lifecycle_menu_state |= ((1 << MODE_INFO_DRAW) | (1 << MODE_MENU)); g_extern.lifecycle_mode_state |= ((1ULL << MODE_INFO_DRAW) | (1ULL << MODE_MENU));
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
strlcpy(g_settings.video.cg_shader_path, default_paths.shader_file, sizeof(g_settings.video.cg_shader_path)); strlcpy(g_settings.video.cg_shader_path, default_paths.shader_file, sizeof(g_settings.video.cg_shader_path));
strlcpy(g_settings.video.second_pass_shader, default_paths.shader_file, sizeof(g_settings.video.second_pass_shader)); strlcpy(g_settings.video.second_pass_shader, default_paths.shader_file, sizeof(g_settings.video.second_pass_shader));
@ -258,14 +258,14 @@ void config_set_defaults(void)
strlcpy(g_extern.console.main_wrap.paths.default_sram_dir, default_paths.sram_dir, sizeof(g_extern.console.main_wrap.paths.default_sram_dir)); strlcpy(g_extern.console.main_wrap.paths.default_sram_dir, default_paths.sram_dir, sizeof(g_extern.console.main_wrap.paths.default_sram_dir));
g_extern.console.screen.overscan_amount = 0.0f; g_extern.console.screen.overscan_amount = 0.0f;
g_extern.console.screen.gamma_correction = DEFAULT_GAMMA; g_extern.console.screen.gamma_correction = DEFAULT_GAMMA;
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_OVERSCAN_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_OVERSCAN_ENABLE);
g_extern.lifecycle_menu_state |= (1 << MODE_AUDIO_CUSTOM_BGM_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE);
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_SCREENSHOTS_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE);
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_THROTTLE_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_THROTTLE_ENABLE);
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE);
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_SOFT_FILTER_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE);
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_FLICKER_FILTER_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_FLICKER_FILTER_ENABLE);
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
g_extern.console.main_wrap.state.default_savestate_dir.enable = false; g_extern.console.main_wrap.state.default_savestate_dir.enable = false;
g_extern.console.main_wrap.state.default_sram_dir.enable = false; g_extern.console.main_wrap.state.default_sram_dir.enable = false;
@ -483,82 +483,82 @@ bool config_load_file(const char *path)
if (config_get_bool(conf, "info_msg_enable", &msg_enable)) if (config_get_bool(conf, "info_msg_enable", &msg_enable))
{ {
if (msg_enable) if (msg_enable)
g_extern.lifecycle_menu_state |= (1 << MODE_INFO_DRAW); g_extern.lifecycle_mode_state |= (1ULL << MODE_INFO_DRAW);
else else
g_extern.lifecycle_menu_state &= ~(1 << MODE_INFO_DRAW); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INFO_DRAW);
} }
if (config_get_bool(conf, "throttle_enable", &throttle_enable)) if (config_get_bool(conf, "throttle_enable", &throttle_enable))
{ {
if (throttle_enable) if (throttle_enable)
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_THROTTLE_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_THROTTLE_ENABLE);
else else
g_extern.lifecycle_menu_state &= ~(1 << MODE_VIDEO_THROTTLE_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_THROTTLE_ENABLE);
} }
if (config_get_bool(conf, "triple_buffering_enable", &triple_buffering_enable)) if (config_get_bool(conf, "triple_buffering_enable", &triple_buffering_enable))
{ {
if (triple_buffering_enable) if (triple_buffering_enable)
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE);
else else
g_extern.lifecycle_menu_state &= ~(1 << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE);
} }
if (config_get_bool(conf, "overscan_enable", &overscan_enable)) if (config_get_bool(conf, "overscan_enable", &overscan_enable))
{ {
if (overscan_enable) if (overscan_enable)
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_OVERSCAN_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_OVERSCAN_ENABLE);
else else
g_extern.lifecycle_menu_state &= ~(1 << MODE_VIDEO_OVERSCAN_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_OVERSCAN_ENABLE);
} }
if (config_get_bool(conf, "custom_bgm_enable", &custom_bgm_enable)) if (config_get_bool(conf, "custom_bgm_enable", &custom_bgm_enable))
{ {
if (custom_bgm_enable) if (custom_bgm_enable)
g_extern.lifecycle_menu_state |= (1 << MODE_AUDIO_CUSTOM_BGM_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE);
else else
g_extern.lifecycle_menu_state &= ~(1 << MODE_AUDIO_CUSTOM_BGM_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE);
} }
if (config_get_bool(conf, "screenshots_enable", &screenshots_enable)) if (config_get_bool(conf, "screenshots_enable", &screenshots_enable))
{ {
if (screenshots_enable) if (screenshots_enable)
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_SCREENSHOTS_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE);
else else
g_extern.lifecycle_menu_state &= ~(1 << MODE_VIDEO_SCREENSHOTS_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE);
} }
if (config_get_bool(conf, "flicker_filter_enable", &flicker_filter_enable)) if (config_get_bool(conf, "flicker_filter_enable", &flicker_filter_enable))
{ {
if (flicker_filter_enable) if (flicker_filter_enable)
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_FLICKER_FILTER_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_FLICKER_FILTER_ENABLE);
else else
g_extern.lifecycle_menu_state &= ~(1 << MODE_VIDEO_FLICKER_FILTER_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_FLICKER_FILTER_ENABLE);
} }
if (config_get_bool(conf, "soft_filter_enable", &soft_filter_enable)) if (config_get_bool(conf, "soft_filter_enable", &soft_filter_enable))
{ {
if (soft_filter_enable) if (soft_filter_enable)
g_extern.lifecycle_menu_state |= (1 << MODE_VIDEO_SOFT_FILTER_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE);
else else
g_extern.lifecycle_menu_state &= ~(1 << MODE_VIDEO_SOFT_FILTER_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE);
} }
if (config_get_int(conf, "unzip_mode", &zip_extract_mode)) if (config_get_int(conf, "unzip_mode", &zip_extract_mode))
{ {
g_extern.lifecycle_menu_state &= ~((1 << MODE_UNZIP_TO_CURDIR) | g_extern.lifecycle_mode_state &= ~((1ULL << MODE_UNZIP_TO_CURDIR) |
(1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE) | (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE) |
(1 << MODE_UNZIP_TO_CACHEDIR)); (1ULL << MODE_UNZIP_TO_CACHEDIR));
switch(zip_extract_mode) switch(zip_extract_mode)
{ {
case 0: case 0:
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR);
break; break;
case 1: case 1:
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE);
break; break;
case 2: case 2:
g_extern.lifecycle_menu_state |= (1 << MODE_UNZIP_TO_CACHEDIR); g_extern.lifecycle_mode_state |= (1ULL << MODE_UNZIP_TO_CACHEDIR);
break; break;
} }
} }
@ -1164,12 +1164,12 @@ bool config_save_file(const char *path)
config_set_float(conf, "audio_rate_control_delta", g_settings.audio.rate_control_delta); config_set_float(conf, "audio_rate_control_delta", g_settings.audio.rate_control_delta);
config_set_string(conf, "system_directory", g_settings.system_directory); config_set_string(conf, "system_directory", g_settings.system_directory);
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_OVERSCAN_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_OVERSCAN_ENABLE))
config_set_bool(conf, "overscan_enable", true); config_set_bool(conf, "overscan_enable", true);
else else
config_set_bool(conf, "overscan_enable", false); config_set_bool(conf, "overscan_enable", false);
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_SCREENSHOTS_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE))
config_set_bool(conf, "screenshots_enable", true); config_set_bool(conf, "screenshots_enable", true);
else else
config_set_bool(conf, "screenshots_enable", false); config_set_bool(conf, "screenshots_enable", false);
@ -1178,36 +1178,36 @@ bool config_save_file(const char *path)
#ifdef _XBOX1 #ifdef _XBOX1
config_set_int(conf, "sound_volume_level", g_extern.console.sound.volume_level); config_set_int(conf, "sound_volume_level", g_extern.console.sound.volume_level);
#endif #endif
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_THROTTLE_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_THROTTLE_ENABLE))
config_set_bool(conf, "throttle_enable", true); config_set_bool(conf, "throttle_enable", true);
else else
config_set_bool(conf, "throttle_enable", false); config_set_bool(conf, "throttle_enable", false);
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE))
config_set_bool(conf, "triple_buffering_enable", true); config_set_bool(conf, "triple_buffering_enable", true);
else else
config_set_bool(conf, "triple_buffering_enable", false); config_set_bool(conf, "triple_buffering_enable", false);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
config_set_bool(conf, "info_msg_enable", true); config_set_bool(conf, "info_msg_enable", true);
else else
config_set_bool(conf, "info_msg_enable", false); config_set_bool(conf, "info_msg_enable", false);
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_SOFT_FILTER_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE))
config_set_bool(conf, "soft_filter_enable", true); config_set_bool(conf, "soft_filter_enable", true);
else else
config_set_bool(conf, "soft_filter_enable", false); config_set_bool(conf, "soft_filter_enable", false);
if (g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_FLICKER_FILTER_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_FLICKER_FILTER_ENABLE))
config_set_bool(conf, "flicker_filter_enable", true); config_set_bool(conf, "flicker_filter_enable", true);
else else
config_set_bool(conf, "flicker_filter_enable", false); config_set_bool(conf, "flicker_filter_enable", false);
if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR))
config_set_int(conf, "unzip_mode", 0); config_set_int(conf, "unzip_mode", 0);
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CURDIR_AND_LOAD_FIRST_FILE))
config_set_int(conf, "unzip_mode", 1); config_set_int(conf, "unzip_mode", 1);
else if (g_extern.lifecycle_menu_state & (1 << MODE_UNZIP_TO_CACHEDIR)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_UNZIP_TO_CACHEDIR))
config_set_int(conf, "unzip_mode", 2); config_set_int(conf, "unzip_mode", 2);
config_set_int(conf, "flicker_filter_index", g_extern.console.screen.flicker_filter_index); config_set_int(conf, "flicker_filter_index", g_extern.console.screen.flicker_filter_index);
@ -1228,7 +1228,7 @@ bool config_save_file(const char *path)
config_set_int(conf, "audio_mute", g_extern.audio_data.mute); config_set_int(conf, "audio_mute", g_extern.audio_data.mute);
config_set_int(conf, "screen_orientation", g_extern.console.screen.orientation); config_set_int(conf, "screen_orientation", g_extern.console.screen.orientation);
if (g_extern.lifecycle_menu_state & (1 << MODE_AUDIO_CUSTOM_BGM_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE))
config_set_bool(conf, "custom_bgm_enable", true); config_set_bool(conf, "custom_bgm_enable", true);
else else
config_set_bool(conf, "custom_bgm_enable", false); config_set_bool(conf, "custom_bgm_enable", false);

16
xdk/xdk_d3d.cpp
View File

@ -374,7 +374,7 @@ static bool xdk_d3d_set_shader(void *data, enum rarch_shader_type type, const ch
void xdk_d3d_generate_pp(D3DPRESENT_PARAMETERS *d3dpp, const video_info_t *video) void xdk_d3d_generate_pp(D3DPRESENT_PARAMETERS *d3dpp, const video_info_t *video)
{ {
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data; xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data;
unsigned lifecycle_menu_state = g_extern.lifecycle_menu_state; uint64_t lifecycle_mode_state = g_extern.lifecycle_mode_state;
memset(d3dpp, 0, sizeof(*d3dpp)); memset(d3dpp, 0, sizeof(*d3dpp));
@ -416,14 +416,14 @@ void xdk_d3d_generate_pp(D3DPRESENT_PARAMETERS *d3dpp, const video_info_t *video
d3dpp->Flags = D3DPRESENTFLAG_INTERLACED; d3dpp->Flags = D3DPRESENTFLAG_INTERLACED;
} }
if (lifecycle_menu_state & MODE_MENU_WIDESCREEN) if (lifecycle_mode_state & MODE_MENU_WIDESCREEN)
d3dpp->Flags |= D3DPRESENTFLAG_WIDESCREEN; d3dpp->Flags |= D3DPRESENTFLAG_WIDESCREEN;
d3dpp->BackBufferFormat = D3DFMT_X8R8G8B8; d3dpp->BackBufferFormat = D3DFMT_X8R8G8B8;
d3dpp->FullScreen_PresentationInterval = d3d->vsync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE; d3dpp->FullScreen_PresentationInterval = d3d->vsync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE;
d3dpp->SwapEffect = D3DSWAPEFFECT_COPY; d3dpp->SwapEffect = D3DSWAPEFFECT_COPY;
#elif defined(_XBOX360) #elif defined(_XBOX360)
if (!(lifecycle_menu_state & (1 << MODE_MENU_WIDESCREEN))) if (!(lifecycle_mode_state & (1ULL << MODE_MENU_WIDESCREEN)))
d3dpp->Flags |= D3DPRESENTFLAG_NO_LETTERBOX; d3dpp->Flags |= D3DPRESENTFLAG_NO_LETTERBOX;
if (g_extern.console.screen.gamma_correction) if (g_extern.console.screen.gamma_correction)
@ -694,7 +694,7 @@ static bool xdk_d3d_frame(void *data, const void *frame,
{ {
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data; xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data;
LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->d3d_render_device; LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->d3d_render_device;
unsigned lifecycle_menu_state = g_extern.lifecycle_menu_state; uint64_t lifecycle_mode_state = g_extern.lifecycle_mode_state;
#ifdef HAVE_FBO #ifdef HAVE_FBO
D3DSurface* pRenderTarget0; D3DSurface* pRenderTarget0;
#endif #endif
@ -821,7 +821,7 @@ static bool xdk_d3d_frame(void *data, const void *frame,
d3dr->BeginScene(); d3dr->BeginScene();
d3dr->SetFlickerFilter(g_extern.console.screen.flicker_filter_index); d3dr->SetFlickerFilter(g_extern.console.screen.flicker_filter_index);
d3dr->SetSoftDisplayFilter(g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_SOFT_FILTER_ENABLE)); d3dr->SetSoftDisplayFilter(g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE));
d3dr->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2); d3dr->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
d3dr->EndScene(); d3dr->EndScene();
#elif defined(_XBOX360) #elif defined(_XBOX360)
@ -863,13 +863,13 @@ static bool xdk_d3d_frame(void *data, const void *frame,
float msg_width = 60; float msg_width = 60;
float msg_height = 365; float msg_height = 365;
#elif defined(_XBOX360) #elif defined(_XBOX360)
float mem_width = (lifecycle_menu_state & (1 << MODE_MENU_HD)) ? 160 : 100; float mem_width = (lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? 160 : 100;
float mem_height = 70; float mem_height = 70;
float msg_width = mem_width; float msg_width = mem_width;
float msg_height = mem_height + 50; float msg_height = mem_height + 50;
#endif #endif
if (lifecycle_menu_state & (1 << MODE_FPS_DRAW)) if (lifecycle_mode_state & (1ULL << MODE_FPS_DRAW))
{ {
MEMORYSTATUS stat; MEMORYSTATUS stat;
GlobalMemoryStatus(&stat); GlobalMemoryStatus(&stat);
@ -889,7 +889,7 @@ static bool xdk_d3d_frame(void *data, const void *frame,
if (msg) if (msg)
d3d->font_ctx->render_msg_place(d3d, msg_width, msg_height, 0.0f, 0, msg); d3d->font_ctx->render_msg_place(d3d, msg_width, msg_height, 0.0f, 0, msg);
if (lifecycle_menu_state & (1 << MODE_MENU_DRAW)) if (lifecycle_mode_state & (1ULL << MODE_MENU_DRAW))
{ {
#ifdef _XBOX360 #ifdef _XBOX360
app.Render(); app.Render();