From 9c3d943600a4436dd25f7712f04d0f9c679ad4f3 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 5 May 2013 16:02:57 +0200 Subject: [PATCH] (RGUI/RMenu) Get rid of SRAM/Savestate dir enable - obsolete now --- frontend/menu/menu_common.h | 2 -- frontend/menu/rgui.c | 18 --------------- frontend/menu/rmenu.c | 33 ---------------------------- frontend/menu/rmenu.h | 2 -- frontend/menu/rmenu_xui.cpp | 44 ------------------------------------- general.h | 2 -- settings.c | 28 ----------------------- 7 files changed, 129 deletions(-) diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h index 58b54bbfbb..209f127c44 100644 --- a/frontend/menu/menu_common.h +++ b/frontend/menu/menu_common.h @@ -160,8 +160,6 @@ typedef enum RGUI_SETTINGS_AUDIO_MUTE, RGUI_SETTINGS_AUDIO_CONTROL_RATE_DELTA, RGUI_SETTINGS_ZIP_EXTRACT, - RGUI_SETTINGS_SRAM_DIR, - RGUI_SETTINGS_STATE_DIR, RGUI_SETTINGS_DEBUG_TEXT, RGUI_SETTINGS_RESTART_EMULATOR, RGUI_SETTINGS_RESUME_GAME, diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index 3e7851e184..2429fbd41e 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -586,12 +586,6 @@ static void render_text(rgui_handle_t *rgui) case RGUI_SETTINGS_AUDIO_CONTROL_RATE_DELTA: snprintf(type_str, sizeof(type_str), "%.3f", g_settings.audio.rate_control_delta); break; - case RGUI_SETTINGS_SRAM_DIR: - snprintf(type_str, sizeof(type_str), (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE)) ? "ON" : "OFF"); - break; - case RGUI_SETTINGS_STATE_DIR: - snprintf(type_str, sizeof(type_str), (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE)) ? "ON" : "OFF"); - break; case RGUI_SETTINGS_DEBUG_TEXT: snprintf(type_str, sizeof(type_str), (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? "ON" : "OFF"); break; @@ -920,18 +914,6 @@ static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, r else if (action == RGUI_ACTION_RIGHT) settings_set(1ULL << S_AUDIO_CONTROL_RATE_INCREMENT); break; - case RGUI_SETTINGS_SRAM_DIR: - if (action == RGUI_ACTION_START || action == RGUI_ACTION_LEFT) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE); - else if (action == RGUI_ACTION_RIGHT) - g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE); - break; - case RGUI_SETTINGS_STATE_DIR: - if (action == RGUI_ACTION_START || action == RGUI_ACTION_LEFT) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE); - else if (action == RGUI_ACTION_RIGHT) - g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE); - break; case RGUI_SETTINGS_DEBUG_TEXT: if (action == RGUI_ACTION_START || action == RGUI_ACTION_LEFT) g_extern.lifecycle_mode_state &= ~(1ULL << MODE_FPS_DRAW); diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index 7e079d96e8..11474fc17b 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -1233,29 +1233,6 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t if (input & (1ULL << DEVICE_NAV_START)) strlcpy(g_settings.system_directory, default_paths.system_dir, sizeof(g_settings.system_directory)); break; - case SETTING_ENABLE_SRAM_PATH: - if ((input & (1ULL << DEVICE_NAV_LEFT)) || (input & (1ULL << DEVICE_NAV_RIGHT))) - { - if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE)) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE); - else - g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE); - } - - if (input & (1ULL << DEVICE_NAV_START)) - g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE); - break; - case SETTING_ENABLE_STATE_PATH: - if ((input & (1ULL << DEVICE_NAV_LEFT)) || (input & (1ULL << DEVICE_NAV_RIGHT))) - { - if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE)) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE); - else - g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE); - } - if (input & (1ULL << DEVICE_NAV_START)) - g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE); - break; case SETTING_PATH_DEFAULT_ALL: if ((input & (1ULL << DEVICE_NAV_LEFT)) || (input & (1ULL << DEVICE_NAV_RIGHT)) || (input & (1ULL << DEVICE_NAV_B)) || (input & (1ULL << DEVICE_NAV_START))) { @@ -2000,16 +1977,6 @@ static int select_setting(void *data, uint64_t input) strlcpy(setting_text, g_settings.system_directory, sizeof(setting_text)); strlcpy(comment, "INFO - Set the default [System directory] path.", sizeof(comment)); break; - case SETTING_ENABLE_SRAM_PATH: - snprintf(text, sizeof(text), "Custom SRAM Dir Enable"); - snprintf(setting_text, sizeof(setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE)) ? "ON" : "OFF"); - snprintf(comment, sizeof(comment), "INFO - [Custom SRAM Dir Path] is set to '%s'.", (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE)) ? "ON" : "OFF"); - break; - case SETTING_ENABLE_STATE_PATH: - snprintf(text, sizeof(text), "Custom Savestate Dir Enable"); - snprintf(setting_text, sizeof(setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE)) ? "ON" : "OFF"); - snprintf(comment, sizeof(comment), "INFO - [Custom Savestate Dir Path] is set to '%s'.", (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE)) ? "ON" : "OFF"); - break; case SETTING_CONTROLS_SCHEME: strlcpy(text, "Control Scheme Preset", sizeof(text)); snprintf(comment, sizeof(comment), "INFO - Input scheme preset [%s] is selected.", g_extern.file_state.input_cfg_path); diff --git a/frontend/menu/rmenu.h b/frontend/menu/rmenu.h index 801f4340cf..9f07cc7efe 100644 --- a/frontend/menu/rmenu.h +++ b/frontend/menu/rmenu.h @@ -93,8 +93,6 @@ enum SETTING_PATH_CHEATS, #endif SETTING_PATH_SYSTEM, - SETTING_ENABLE_SRAM_PATH, - SETTING_ENABLE_STATE_PATH, SETTING_PATH_DEFAULT_ALL, SETTING_CONTROLS_SCHEME, SETTING_CONTROLS_NUMBER, diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp index 8001c97c86..401c08cb18 100644 --- a/frontend/menu/rmenu_xui.cpp +++ b/frontend/menu/rmenu_xui.cpp @@ -1010,8 +1010,6 @@ HRESULT CRetroArchSettings::OnInit(XUIMessageInit * pInitData, BOOL& bHandled) XuiListSetText(m_settingslist, SETTING_HW_TEXTURE_FILTER, g_settings.video.smooth ? L"Hardware filtering shader #1: Linear interpolation" : L"Hardware filtering shader #1: Point filtering"); menu_settings_create_menu_item_label_w(strw_buffer, S_LBL_REWIND_GRANULARITY, sizeof(strw_buffer)); XuiListSetText(m_settingslist, SETTING_EMU_REWIND_GRANULARITY, strw_buffer); - XuiListSetText(m_settingslist, SETTING_ENABLE_SRAM_PATH, (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE)) ? L"SRAM Path Enable: ON" : L"SRAM Path Enable: OFF"); - XuiListSetText(m_settingslist, SETTING_ENABLE_STATE_PATH, (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE)) ? L"Savestate Path Enable: ON" : L"Savestate Path Enable: OFF"); return 0; } @@ -1040,20 +1038,6 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled menu_settings_create_menu_item_label_w(strw_buffer, S_LBL_REWIND_GRANULARITY, sizeof(strw_buffer)); XuiListSetText(m_settingslist, SETTING_EMU_REWIND_GRANULARITY, strw_buffer); break; - case SETTING_ENABLE_SRAM_PATH: - if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE)) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE); - else - g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE); - XuiListSetText(m_settingslist, SETTING_ENABLE_SRAM_PATH, (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE)) ? L"SRAM Path Enable: ON" : L"SRAM Path Enable: OFF"); - break; - case SETTING_ENABLE_STATE_PATH: - if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE)) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE); - else - g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE); - XuiListSetText(m_settingslist, SETTING_ENABLE_STATE_PATH, (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE)) ? L"Savestate Path Enable: ON" : L"Savestate Path Enable: OFF"); - break; case SETTING_EMU_SHOW_INFO_MSG: if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INFO_DRAW); @@ -1110,20 +1094,6 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro menu_settings_create_menu_item_label_w(strw_buffer, S_LBL_REWIND_GRANULARITY, sizeof(strw_buffer)); XuiListSetText(m_settingslist, SETTING_EMU_REWIND_GRANULARITY, strw_buffer); break; - case SETTING_ENABLE_SRAM_PATH: - if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE)) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE); - else - g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE); - XuiListSetText(m_settingslist, SETTING_ENABLE_SRAM_PATH, (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE)) ? L"SRAM Path Enable: ON" : L"SRAM Path Enable: OFF"); - break; - case SETTING_ENABLE_STATE_PATH: - if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE)) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE); - else - g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE); - XuiListSetText(m_settingslist, SETTING_ENABLE_STATE_PATH, (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE)) ? L"Savestate Path Enable: ON" : L"Savestate Path Enable: OFF"); - break; case SETTING_EMU_SHOW_INFO_MSG: if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INFO_DRAW); @@ -1186,20 +1156,6 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro menu_settings_create_menu_item_label_w(strw_buffer, S_LBL_REWIND_GRANULARITY, sizeof(strw_buffer)); XuiListSetText(m_settingslist, SETTING_EMU_REWIND_GRANULARITY, strw_buffer); break; - case SETTING_ENABLE_SRAM_PATH: - if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE)) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE); - else - g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE); - XuiListSetText(m_settingslist, SETTING_ENABLE_SRAM_PATH, (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE)) ? L"SRAM Path Enable: ON" : L"SRAM Path Enable: OFF"); - break; - case SETTING_ENABLE_STATE_PATH: - if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE)) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE); - else - g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE); - XuiListSetText(m_settingslist, SETTING_ENABLE_STATE_PATH, (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE)) ? L"Savestate Path Enable: ON" : L"Savestate Path Enable: OFF"); - break; case SETTING_HW_TEXTURE_FILTER: g_settings.video.smooth = !g_settings.video.smooth; XuiListSetText(m_settingslist, SETTING_HW_TEXTURE_FILTER, g_settings.video.smooth ? L"Hardware filtering shader #1: Linear interpolation" : L"Hardware filtering shader #1: Point filtering"); diff --git a/general.h b/general.h index fa5c695901..30f3be9ddc 100644 --- a/general.h +++ b/general.h @@ -100,8 +100,6 @@ enum menu_enums { MODE_GAME = 0, MODE_LOAD_GAME, - MODE_LOAD_GAME_SRAM_DIR_ENABLE, - MODE_LOAD_GAME_STATE_DIR_ENABLE, MODE_LOAD_FIRST_SHADER, MODE_INIT, MODE_MENU, diff --git a/settings.c b/settings.c index cb62e93ba5..0b0a838ddc 100644 --- a/settings.c +++ b/settings.c @@ -488,8 +488,6 @@ bool config_load_file(const char *path) bool custom_bgm_enable = false; bool flicker_filter_enable = false; bool soft_filter_enable = false; - bool sram_dir_enable = false; - bool state_dir_enable = false; #ifdef HAVE_RMENU if (config_get_path(conf, "menu_texture_path", tmp_str, sizeof(tmp_str))) @@ -544,22 +542,6 @@ bool config_load_file(const char *path) g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE); } - if (config_get_bool(conf, "sram_dir_enable", &sram_dir_enable)) - { - if (sram_dir_enable) - g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE); - else - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE); - } - - if (config_get_bool(conf, "savestate_dir_enable", &state_dir_enable)) - { - if (state_dir_enable) - g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE); - else - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE); - } - CONFIG_GET_INT_EXTERN(console.screen.flicker_filter_index, "flicker_filter_index"); CONFIG_GET_INT_EXTERN(console.screen.soft_filter_index, "soft_filter_index"); #ifdef _XBOX1 @@ -996,16 +978,6 @@ bool config_save_file(const char *path) else config_set_bool(conf, "custom_bgm_enable", false); - if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_SRAM_DIR_ENABLE)) - config_set_bool(conf, "sram_dir_enable", true); - else - config_set_bool(conf, "sram_dir_enable", false); - - if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME_STATE_DIR_ENABLE)) - config_set_bool(conf, "savestate_dir_enable", true); - else - config_set_bool(conf, "savestate_dir_enable", false); - for (unsigned i = 0; i < MAX_PLAYERS; i++) { char cfg[64];