CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-13 05:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of MODE_INFO_DRAW

Browse Source
This commit is contained in:
twinaphex 2013-10-11 01:28:26 +02:00
parent 849cfb680e
commit 310f404747
7 changed files with 4 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/menu/menu_common.c
View File

@ -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];

19
frontend/menu/rmenu.c
View File

@ -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;

1
frontend/menu/rmenu.h
View File

@ -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,

21
frontend/menu/rmenu_xui.cpp
View File

@ -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");

4
frontend/menu/rmenudisp.c
View File

@ -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;

1
general.h
View File

@ -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,

23
settings.c
View File

@ -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);
}