ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove S_DELAY macros

This commit is contained in:
twinaphex 2013-03-09 22:21:53 +01:00
parent 43d865cc5e
commit 04c9b14b7e
5 changed files with 29 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/frontend_console.c
View File

@ -312,7 +312,7 @@ begin_loop:
{ {
RARCH_ERR("rarch_main_init failed.\n"); RARCH_ERR("rarch_main_init failed.\n");
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU);
menu_settings_msg(S_MSG_ROM_LOADING_ERROR, S_DELAY_180); menu_settings_msg(S_MSG_ROM_LOADING_ERROR, 180);
} }
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INIT); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INIT);
} }

10
frontend/menu/menu_settings.h
View File

@ -17,16 +17,6 @@
#ifndef CONSOLE_SETTINGS_H #ifndef CONSOLE_SETTINGS_H
#define CONSOLE_SETTINGS_H #define CONSOLE_SETTINGS_H
enum
{
S_DELAY_0 = 0,
S_DELAY_1 = 1,
S_DELAY_45 = 45,
S_DELAY_90 = 90,
S_DELAY_180 = 180,
S_DELAY_270 = 270
};
enum enum
{ {
S_ASPECT_RATIO_DECREMENT = 0, S_ASPECT_RATIO_DECREMENT = 0,

6
frontend/menu/rgui.c
View File

@ -626,7 +626,7 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
menu_settings_set(S_REWIND); menu_settings_set(S_REWIND);
if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); menu_settings_msg(S_MSG_RESTART_RARCH, 180);
} }
else if (action == RGUI_ACTION_START) else if (action == RGUI_ACTION_START)
g_settings.rewind_enable = false; g_settings.rewind_enable = false;
@ -680,7 +680,7 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
data + (height - 1) * (pitch >> 1), data + (height - 1) * (pitch >> 1),
width, height, -pitch, false); width, height, -pitch, false);
msg_queue_push(g_extern.msg_queue, r ? "Screenshot saved" : "Screenshot failed to save", 1, S_DELAY_90); msg_queue_push(g_extern.msg_queue, r ? "Screenshot saved" : "Screenshot failed to save", 1, 90);
} }
break; break;
#ifndef HAVE_DYNAMIC #ifndef HAVE_DYNAMIC
@ -1385,7 +1385,7 @@ int rgui_iterate(rgui_handle_t *rgui, rgui_action_t action)
strlcpy(g_extern.fullpath, rgui->path_buf, sizeof(g_extern.fullpath)); strlcpy(g_extern.fullpath, rgui->path_buf, sizeof(g_extern.fullpath));
g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME);
menu_settings_msg(S_MSG_LOADING_ROM, S_DELAY_1); menu_settings_msg(S_MSG_LOADING_ROM, 1);
rgui->need_refresh = true; // in case of zip extract rgui->need_refresh = true; // in case of zip extract
rgui->msg_force = true; rgui->msg_force = true;
} }

28
frontend/menu/rmenu.c
View File

@ -625,7 +625,7 @@ static void browser_update(void *data, uint64_t input, const char *extensions)
ret = filebrowser_iterate(b, action); ret = filebrowser_iterate(b, action);
if(!ret) if(!ret)
menu_settings_msg(S_MSG_DIR_LOADING_ERROR, S_DELAY_180); menu_settings_msg(S_MSG_DIR_LOADING_ERROR, 180);
} }
void browser_render(void *data) void browser_render(void *data)
@ -724,7 +724,7 @@ int select_file(void *data, void *state)
{ {
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_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); menu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, 180);
} }
else else
RARCH_ERR("Shaders are unsupported on this platform.\n"); RARCH_ERR("Shaders are unsupported on this platform.\n");
@ -740,7 +740,7 @@ int select_file(void *data, void *state)
{ {
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_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); menu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, 180);
} }
else else
RARCH_ERR("Shaders are unsupported on this platform.\n"); RARCH_ERR("Shaders are unsupported on this platform.\n");
@ -782,7 +782,7 @@ int select_file(void *data, void *state)
else else
{ {
if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); menu_settings_msg(S_MSG_RESTART_RARCH, 180);
} }
break; break;
} }
@ -791,7 +791,7 @@ int select_file(void *data, void *state)
} }
if(!ret) if(!ret)
menu_settings_msg(S_MSG_DIR_LOADING_ERROR, S_DELAY_180); menu_settings_msg(S_MSG_DIR_LOADING_ERROR, 180);
} }
else if (input & (1ULL << RMENU_DEVICE_NAV_X)) else if (input & (1ULL << RMENU_DEVICE_NAV_X))
menu_stack_pop(); menu_stack_pop();
@ -889,7 +889,7 @@ int select_directory(void *data, void *state)
} }
if(!ret) if(!ret)
menu_settings_msg(S_MSG_DIR_LOADING_ERROR, S_DELAY_180); menu_settings_msg(S_MSG_DIR_LOADING_ERROR, 180);
display_menubar(current_menu); display_menubar(current_menu);
@ -1106,7 +1106,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
{ {
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_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); menu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, 180);
} }
else else
RARCH_ERR("Shaders are unsupported on this platform.\n"); RARCH_ERR("Shaders are unsupported on this platform.\n");
@ -1126,7 +1126,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
{ {
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_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); menu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, 180);
} }
else else
RARCH_ERR("Shaders are unsupported on this platform.\n"); RARCH_ERR("Shaders are unsupported on this platform.\n");
@ -1159,7 +1159,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_LOW_RAM_MODE_ENABLE_PENDING); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_LOW_RAM_MODE_ENABLE_PENDING);
if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); menu_settings_msg(S_MSG_RESTART_RARCH, 180);
} }
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
@ -1172,7 +1172,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_LOW_RAM_MODE_ENABLE_PENDING); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_LOW_RAM_MODE_ENABLE_PENDING);
if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); menu_settings_msg(S_MSG_RESTART_RARCH, 180);
} }
} }
} }
@ -1485,7 +1485,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
menu_settings_set(S_REWIND); menu_settings_set(S_REWIND);
if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); menu_settings_msg(S_MSG_RESTART_RARCH, 180);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
g_settings.rewind_enable = false; g_settings.rewind_enable = false;
@ -1573,14 +1573,14 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
{ {
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_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); menu_settings_msg(S_MSG_RESTART_RARCH, 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_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); menu_settings_msg(S_MSG_RESTART_RARCH, 180);
} }
break; break;
#endif #endif
@ -1961,7 +1961,7 @@ int select_rom(void *data, void *state)
bool ret = filebrowser_iterate(filebrowser, FILEBROWSER_ACTION_OK); bool ret = filebrowser_iterate(filebrowser, FILEBROWSER_ACTION_OK);
if(!ret) if(!ret)
menu_settings_msg(S_MSG_DIR_LOADING_ERROR, S_DELAY_180); menu_settings_msg(S_MSG_DIR_LOADING_ERROR, 180);
} }
else else
{ {

22
frontend/menu/rmenu_xui.cpp
View File

@ -171,7 +171,7 @@ static void browser_update(filebrowser_t * b, uint64_t input, const char *extens
ret = filebrowser_iterate(b, action); ret = filebrowser_iterate(b, action);
if(!ret) if(!ret)
menu_settings_msg(S_MSG_DIR_LOADING_ERROR, S_DELAY_180); menu_settings_msg(S_MSG_DIR_LOADING_ERROR, 180);
} }
HRESULT CRetroArchFileBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled) HRESULT CRetroArchFileBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
@ -432,7 +432,7 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
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_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); menu_settings_msg(S_MSG_RESTART_RARCH, 180);
break; break;
case SETTING_EMU_REWIND_GRANULARITY: case SETTING_EMU_REWIND_GRANULARITY:
g_settings.rewind_granularity++; g_settings.rewind_granularity++;
@ -502,7 +502,7 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
hCur = app.hShaderBrowser; hCur = app.hShaderBrowser;
if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_SELECT_SHADER, S_DELAY_180); menu_settings_msg(S_MSG_SELECT_SHADER, 180);
NavigateForward(app.hShaderBrowser); NavigateForward(app.hShaderBrowser);
break; break;
@ -515,7 +515,7 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
hCur = app.hShaderBrowser; hCur = app.hShaderBrowser;
if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_SELECT_SHADER, S_DELAY_180); menu_settings_msg(S_MSG_SELECT_SHADER, 180);
NavigateForward(app.hShaderBrowser); NavigateForward(app.hShaderBrowser);
break; break;
@ -560,7 +560,7 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
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_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); menu_settings_msg(S_MSG_RESTART_RARCH, 180);
break; break;
case SETTING_EMU_REWIND_GRANULARITY: case SETTING_EMU_REWIND_GRANULARITY:
if (g_settings.rewind_granularity > 1) if (g_settings.rewind_granularity > 1)
@ -699,7 +699,7 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
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_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); menu_settings_msg(S_MSG_RESTART_RARCH, 180);
break; break;
case SETTING_EMU_REWIND_GRANULARITY: case SETTING_EMU_REWIND_GRANULARITY:
g_settings.rewind_granularity++; g_settings.rewind_granularity++;
@ -931,7 +931,7 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
m_quickmenulist.SetText(MENU_XUI_ITEM_ASPECT_RATIO, strw_buffer); m_quickmenulist.SetText(MENU_XUI_ITEM_ASPECT_RATIO, strw_buffer);
if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_RESIZE_SCREEN, S_DELAY_270); menu_settings_msg(S_MSG_RESIZE_SCREEN, 270);
break; break;
case MENU_XUI_ITEM_FRAME_ADVANCE: case MENU_XUI_ITEM_FRAME_ADVANCE:
if (g_extern.main_is_init) if (g_extern.main_is_init)
@ -1005,7 +1005,7 @@ HRESULT CRetroArchShaderBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHand
{ {
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_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); menu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, 180);
XuiSceneNavigateBack(hCur, app.hMainScene, XUSER_INDEX_ANY); XuiSceneNavigateBack(hCur, app.hMainScene, XUSER_INDEX_ANY);
} }
else else
@ -1020,7 +1020,7 @@ HRESULT CRetroArchShaderBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHand
{ {
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_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); menu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, 180);
} }
else else
RARCH_ERR("Shaders are unsupported on this platform.\n"); RARCH_ERR("Shaders are unsupported on this platform.\n");
@ -1144,7 +1144,7 @@ HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
hCur = app.hControlsMenu; hCur = app.hControlsMenu;
if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_CHANGE_CONTROLS, S_DELAY_180); menu_settings_msg(S_MSG_CHANGE_CONTROLS, 180);
NavigateForward(app.hControlsMenu); NavigateForward(app.hControlsMenu);
} }
@ -1157,7 +1157,7 @@ HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
hCur = app.hCoreBrowser; hCur = app.hCoreBrowser;
if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
menu_settings_msg(S_MSG_SELECT_LIBRETRO_CORE, S_DELAY_180); menu_settings_msg(S_MSG_SELECT_LIBRETRO_CORE, 180);
NavigateForward(app.hCoreBrowser); NavigateForward(app.hCoreBrowser);
} }