From 310f4047477549c0894be201df6e76adcb2ecfb1 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 11 Oct 2013 01:28:26 +0200 Subject: [PATCH] Get rid of MODE_INFO_DRAW --- frontend/menu/menu_common.c | 3 +-- frontend/menu/rmenu.c | 19 ++----------------- frontend/menu/rmenu.h | 1 - frontend/menu/rmenu_xui.cpp | 21 --------------------- frontend/menu/rmenudisp.c | 4 ---- general.h | 1 - settings.c | 23 +---------------------- 7 files changed, 4 insertions(+), 68 deletions(-) diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index c7772e2ee9..5b87567f20 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -216,8 +216,7 @@ void load_menu_game_prepare(void) { if (*g_extern.fullpath || rgui->load_no_rom) { - if (*g_extern.fullpath && - g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) + if (*g_extern.fullpath) { char tmp[PATH_MAX]; char str[PATH_MAX]; diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index f1c577d73f..0810fe7b6e 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -742,19 +742,6 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t } break; #endif - case SETTING_EMU_SHOW_INFO_MSG: - switch (action) - { - case RGUI_ACTION_LEFT: - case RGUI_ACTION_RIGHT: - case RGUI_ACTION_OK: - settings_set(1ULL << S_INFO_MSG_TOGGLE); - break; - case RGUI_ACTION_START: - settings_set(1ULL << S_DEF_INFO_MSG); - break; - } - break; #ifdef _XBOX1 case SETTING_EMU_AUDIO_SOUND_VOLUME_LEVEL: switch (action) @@ -763,13 +750,11 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t case RGUI_ACTION_RIGHT: case RGUI_ACTION_OK: g_extern.console.sound.volume_level = !g_extern.console.sound.volume_level; - if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) - msg_queue_push(g_extern.msg_queue, "INFO - You need to restart RetroArch.", 1, 180); + msg_queue_push(g_extern.msg_queue, "INFO - You need to restart RetroArch.", 1, 180); break; case RGUI_ACTION_START: g_extern.console.sound.volume_level = 0; - if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) - msg_queue_push(g_extern.msg_queue, "INFO - You need to restart RetroArch.", 1, 180); + msg_queue_push(g_extern.msg_queue, "INFO - You need to restart RetroArch.", 1, 180); break; } break; diff --git a/frontend/menu/rmenu.h b/frontend/menu/rmenu.h index b8d10f7505..46390f42e7 100644 --- a/frontend/menu/rmenu.h +++ b/frontend/menu/rmenu.h @@ -74,7 +74,6 @@ enum SETTING_REWIND_ENABLED, SETTING_REWIND_GRANULARITY, SETTING_EMU_SHOW_DEBUG_INFO_MSG, - SETTING_EMU_SHOW_INFO_MSG, SETTING_EMU_SKIN, SETTING_EMU_END, SETTING_SOUND_MODE, diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp index ef084b804e..a38dfedc09 100644 --- a/frontend/menu/rmenu_xui.cpp +++ b/frontend/menu/rmenu_xui.cpp @@ -47,7 +47,6 @@ enum { INGAME_MENU_REWIND_ENABLED = 0, INGAME_MENU_REWIND_GRANULARITY, - SETTING_EMU_SHOW_INFO_MSG, SETTING_EMU_SHOW_DEBUG_INFO_MSG, }; @@ -396,8 +395,6 @@ static void init_menulist(unsigned menu_id) XuiListInsertItems(m_menulist, INGAME_MENU_REWIND_GRANULARITY, 1); XuiListSetText(m_menulist, INGAME_MENU_REWIND_GRANULARITY, strw_buffer); - XuiListInsertItems(m_menulist, SETTING_EMU_SHOW_INFO_MSG, 1); - XuiListSetText(m_menulist, SETTING_EMU_SHOW_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) ? L"Info Messages: ON" : L"Info Messages: OFF"); XuiListInsertItems(m_menulist, SETTING_EMU_SHOW_DEBUG_INFO_MSG, 1); XuiListSetText(m_menulist, SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_settings.fps_show) ? L"Show Framerate: ON" : L"Show Framerate: OFF"); break; @@ -704,24 +701,6 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro menu_settings_create_menu_item_label_w(strw_buffer, S_LBL_REWIND_GRANULARITY, sizeof(strw_buffer)); XuiListSetText(m_menulist, INGAME_MENU_REWIND_GRANULARITY, strw_buffer); break; - case SETTING_EMU_SHOW_INFO_MSG: - if (action == RGUI_ACTION_LEFT) - { - if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INFO_DRAW); - else - g_extern.lifecycle_mode_state |= (1ULL << MODE_INFO_DRAW); - XuiListSetText(m_menulist, SETTING_EMU_SHOW_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) ? L"Info messages: ON" : L"Info messages: OFF"); - } - else if (action == RGUI_ACTION_RIGHT || action == RGUI_ACTION_OK) - { - if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INFO_DRAW); - else - g_extern.lifecycle_mode_state |= (1ULL << MODE_INFO_DRAW); - XuiListSetText(m_menulist, SETTING_EMU_SHOW_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) ? L"Info messages: ON" : L"Info messages: OFF"); - } - break; case SETTING_EMU_SHOW_DEBUG_INFO_MSG: menu_set_settings(RGUI_SETTINGS_DEBUG_TEXT, action); XuiListSetText(m_menulist, SETTING_EMU_SHOW_DEBUG_INFO_MSG, g_settings.fps_show ? L"Show Framerate: ON" : L"Show Framerate: OFF"); diff --git a/frontend/menu/rmenudisp.c b/frontend/menu/rmenudisp.c index c36f9b4c33..01dec4b831 100644 --- a/frontend/menu/rmenudisp.c +++ b/frontend/menu/rmenudisp.c @@ -371,10 +371,6 @@ static void render_text(void *data) case SETTING_EMU_SHOW_DEBUG_INFO_MSG: strlcpy(text, "Show Framerate", sizeof(text)); break; - case SETTING_EMU_SHOW_INFO_MSG: - strlcpy(text, "Info Messages", sizeof(text)); - snprintf(setting_text, sizeof(setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) ? "ON" : "OFF"); - break; case SETTING_REWIND_ENABLED: strlcpy(text, "Rewind", sizeof(text)); break; diff --git a/general.h b/general.h index b19058b634..c3f8351e0b 100644 --- a/general.h +++ b/general.h @@ -113,7 +113,6 @@ enum menu_enums MODE_MENU_WIDESCREEN, MODE_MENU_HD, MODE_MENU_PREINIT, - MODE_INFO_DRAW, MODE_EXTLAUNCH_MULTIMAN, MODE_EXITSPAWN, MODE_EXITSPAWN_START_GAME, diff --git a/settings.c b/settings.c index 116056725f..d8214752bb 100644 --- a/settings.c +++ b/settings.c @@ -298,7 +298,7 @@ void config_set_defaults(void) #endif #ifdef RARCH_CONSOLE - g_extern.lifecycle_mode_state |= ((1ULL << MODE_INFO_DRAW) | (1ULL << MODE_MENU)); + g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU); strlcpy(g_settings.system_directory, default_paths.system_dir, sizeof(g_settings.system_directory)); @@ -621,14 +621,6 @@ bool config_load_file(const char *path) strlcpy(g_extern.menu_texture_path, tmp_str, sizeof(g_extern.menu_texture_path)); #endif - if (config_get_bool(conf, "info_msg_enable", &msg_enable)) - { - if (msg_enable) - g_extern.lifecycle_mode_state |= (1ULL << MODE_INFO_DRAW); - else - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INFO_DRAW); - } - if (config_get_bool(conf, "triple_buffering_enable", &triple_buffering_enable)) { if (triple_buffering_enable) @@ -1117,12 +1109,10 @@ bool config_save_file(const char *path) config_set_int(conf, "sound_volume_level", g_extern.console.sound.volume_level); #endif bool triple_buffering_enable_val = g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE); - bool info_msg_enable_val = g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW); bool soft_filter_enable_val = g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE); bool flicker_filter_enable_val = g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_FLICKER_FILTER_ENABLE); config_set_bool(conf, "triple_buffering_enable", triple_buffering_enable_val); - config_set_bool(conf, "info_msg_enable", info_msg_enable_val); config_set_bool(conf, "soft_filter_enable", soft_filter_enable_val); config_set_bool(conf, "flicker_filter_enable", flicker_filter_enable_val); @@ -1335,14 +1325,6 @@ void settings_set(uint64_t settings) if (settings & (1ULL << S_INFO_DEBUG_MSG_TOGGLE)) g_settings.fps_show = !g_settings.fps_show; - if (settings & (1ULL << S_INFO_MSG_TOGGLE)) - { - if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INFO_DRAW); - else - g_extern.lifecycle_mode_state |= (1ULL << MODE_INFO_DRAW); - } - if (settings & (1ULL << S_DEF_ASPECT_RATIO)) g_settings.video.aspect_ratio_idx = aspect_ratio_idx; @@ -1375,7 +1357,4 @@ void settings_set(uint64_t settings) if (settings & (1ULL << S_DEF_INFO_DEBUG_MSG)) g_settings.fps_show = false; - - if (settings & (1ULL << S_DEF_INFO_MSG)) - g_extern.lifecycle_mode_state |= (1ULL << MODE_INFO_DRAW); }