libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-10 08:04:37 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(RARCH_CONSOLE) Refactor msg_fps variable

Browse Source
This commit is contained in:
twinaphex 2013-01-11 06:56:05 +01:00
parent 5bf022fd99
commit ca3be92255
8 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/menu/rgui.c
View File

@ -479,7 +479,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");
break;
case RGUI_SETTINGS_DEBUG_TEXT:
snprintf(type_str, sizeof(type_str), g_extern.console.rmenu.state.msg_fps.enable ? "ON" : "OFF");
snprintf(type_str, sizeof(type_str), (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? "ON" : "OFF");
break;
case RGUI_SETTINGS_CUSTOM_VIEWPORT:
case RGUI_SETTINGS_CORE:
@ -752,9 +752,9 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
break;
case RGUI_SETTINGS_DEBUG_TEXT:
if (action == RGUI_ACTION_START || action == RGUI_ACTION_LEFT)
g_extern.console.rmenu.state.msg_fps.enable = false;
g_extern.lifecycle_menu_state &= ~(1 << MODE_FPS_DRAW);
else if (action == RGUI_ACTION_RIGHT)
g_extern.console.rmenu.state.msg_fps.enable = true;
g_extern.lifecycle_menu_state |= (1 << MODE_FPS_DRAW);
break;
case RGUI_SETTINGS_RESTART_EMULATOR:
if (action == RGUI_ACTION_OK)

11
frontend/menu/rmenu.c
View File

@ -286,7 +286,7 @@ static void populate_setting_item(void *data, unsigned input)
/* emu-specific */
case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
snprintf(current_item->text, sizeof(current_item->text), "Debug info messages");
snprintf(current_item->setting_text, sizeof(current_item->setting_text), g_extern.console.rmenu.state.msg_fps.enable ? "ON" : "OFF");
snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? "ON" : "OFF");
snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Show onscreen debug messages.");
break;
case SETTING_EMU_SHOW_INFO_MSG:
@ -1366,9 +1366,14 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
break;
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)))
g_extern.console.rmenu.state.msg_fps.enable = !g_extern.console.rmenu.state.msg_fps.enable;
{
if (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW))
g_extern.lifecycle_menu_state &= ~(1 << MODE_FPS_DRAW);
else
g_extern.lifecycle_menu_state |= (1 << MODE_FPS_DRAW);
}
if(input & (1ULL << RMENU_DEVICE_NAV_START))
g_extern.console.rmenu.state.msg_fps.enable = false;
g_extern.lifecycle_menu_state &= ~(1 << MODE_FPS_DRAW);
break;
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)))

23
frontend/menu/rmenu_xui.cpp
View File

@ -384,7 +384,7 @@ HRESULT CRetroArchSettings::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
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.console.rmenu.state.msg_info.enable ? L"Info messages: ON" : L"Info messages: OFF");
m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, g_extern.console.rmenu.state.msg_fps.enable ? L"Debug Info messages: ON" : L"Debug 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_MENUS, g_extern.console.rmenu.state.rmenu_hd.enable ? 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_HW_TEXTURE_FILTER, g_settings.video.smooth ? L"Hardware filtering shader #1: Linear interpolation" : L"Hardware filtering shader #1: Point filtering");
@ -427,8 +427,11 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
m_settingslist.SetText(SETTING_EMU_SHOW_INFO_MSG, g_extern.console.rmenu.state.msg_info.enable ? L"Info messages: ON" : L"Info messages: OFF");
break;
case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
g_extern.console.rmenu.state.msg_fps.enable = !g_extern.console.rmenu.state.msg_fps.enable;
m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, g_extern.console.rmenu.state.msg_fps.enable ? L"Debug Info messages: ON" : L"Debug Info messages: OFF");
if (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW))
g_extern.lifecycle_menu_state &= ~(1 << MODE_FPS_DRAW);
else
g_extern.lifecycle_menu_state |= (1 << 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");
break;
case SETTING_EMU_MENUS:
g_extern.console.rmenu.state.rmenu_hd.enable = !g_extern.console.rmenu.state.rmenu_hd.enable;
@ -523,8 +526,11 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
m_settingslist.SetText(SETTING_EMU_SHOW_INFO_MSG, g_extern.console.rmenu.state.msg_info.enable ? L"Info messages: ON" : L"Info messages: OFF");
break;
case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
g_extern.console.rmenu.state.msg_fps.enable = !g_extern.console.rmenu.state.msg_fps.enable;
m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, g_extern.console.rmenu.state.msg_fps.enable ? L"Debug Info messages: ON" : L"Debug Info messages: OFF");
if (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW))
g_extern.lifecycle_menu_state &= ~(1 << MODE_FPS_DRAW);
else
g_extern.lifecycle_menu_state |= (1 << 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");
break;
case SETTING_EMU_MENUS:
g_extern.console.rmenu.state.rmenu_hd.enable = !g_extern.console.rmenu.state.rmenu_hd.enable;
@ -582,8 +588,11 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
m_settingslist.SetText(SETTING_EMU_SHOW_INFO_MSG, g_extern.console.rmenu.state.msg_info.enable ? L"Info messages: ON" : L"Info messages: OFF");
break;
case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
g_extern.console.rmenu.state.msg_fps.enable = !g_extern.console.rmenu.state.msg_fps.enable;
m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, g_extern.console.rmenu.state.msg_fps.enable ? L"Debug Info messages: ON" : L"Debug Info messages: OFF");
if (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW))
g_extern.lifecycle_menu_state &= ~(1 << MODE_FPS_DRAW);
else
g_extern.lifecycle_menu_state |= (1 << 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");
break;
case SETTING_EMU_MENUS:
g_extern.console.rmenu.state.rmenu_hd.enable = !g_extern.console.rmenu.state.rmenu_hd.enable;

2
general.h
View File

@ -109,6 +109,7 @@ enum menu_enums
MODE_MENU_PREINIT,
MODE_MENU_INGAME,
MODE_MENU_DRAW,
MODE_FPS_DRAW,
MODE_EXIT,
MODE_LOAD_FIRST_SHADER,
MODE_LOAD_SECOND_SHADER,
@ -496,7 +497,6 @@ struct global
struct
{
rarch_boolean_state_t msg_fps;
rarch_boolean_state_t msg_info;
rarch_boolean_state_t rmenu_widescreen;
rarch_boolean_state_t rmenu_hd;

3
gfx/gl.c
View File

@ -1260,8 +1260,7 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
gl_set_prev_texture(gl, &tex_info);
#ifdef FPS_COUNTER
bool fps_enable = g_extern.console.rmenu.state.msg_fps.enable;
if (fps_enable)
if (lifecycle_menu_state & (1 << MODE_FPS_DRAW))
{
char fps_txt[128];
gfx_get_fps(fps_txt, sizeof(fps_txt), true);

2
gx/gx_video.c
View File

@ -935,7 +935,7 @@ static bool gx_frame(void *data, const void *frame,
GX_DrawDone();
}
if (g_extern.console.rmenu.state.msg_fps.enable)
if (lifecycle_menu_state & (1 << MODE_FPS_DRAW))
{
char fps_txt[128];
char mem1_txt[128];

2
settings.c
View File

@ -294,7 +294,7 @@ void config_set_defaults(void)
g_extern.audio_data.mute = 0;
g_extern.verbose = true;
g_extern.lifecycle_menu_state = (1 << MODE_MENU);
g_extern.lifecycle_menu_state |= (1 << MODE_MENU);
g_extern.console.rmenu.font_size = 1.0f;
g_extern.console.sound.mode = SOUND_MODE_NORMAL;
g_extern.console.screen.viewports.custom_vp.width = 0;

3
xdk/xdk_d3d.cpp
View File

@ -697,7 +697,6 @@ static bool xdk_d3d_frame(void *data, const void *frame,
#ifdef HAVE_FBO
D3DSurface* pRenderTarget0;
#endif
bool fps_enable = g_extern.console.rmenu.state.msg_fps.enable;
#ifdef _XBOX1
unsigned flicker_filter = g_extern.console.screen.state.flicker_filter.value;
bool soft_filter_enable = g_extern.console.screen.state.soft_filter.enable;
@ -873,7 +872,7 @@ static bool xdk_d3d_frame(void *data, const void *frame,
float msg_height = mem_height + 50;
#endif
if(fps_enable)
if (lifecycle_menu_state & (1 << MODE_FPS_DRAW))
{
MEMORYSTATUS stat;
GlobalMemoryStatus(&stat);