mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-15 18:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RMenu) Indent fixes

Browse Source
This commit is contained in:
twinaphex 2013-02-17 22:02:42 +01:00
parent 3fe68149a6
commit 145bad0b36
2 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
frontend/menu/rmenu.c
View File

@ -111,8 +111,8 @@ enum
}; };
/*============================================================ /*============================================================
EVENT CALLBACKS (AND RELATED) EVENT CALLBACKS (AND RELATED)
============================================================ */ ============================================================ */
static void populate_setting_item(void *data, unsigned input) static void populate_setting_item(void *data, unsigned input)
{ {
@ -136,7 +136,7 @@ static void populate_setting_item(void *data, unsigned input)
} }
break; break;
case SETTING_PAL60_MODE: case SETTING_PAL60_MODE:
snprintf(current_item->text, sizeof(current_item->text), "PAL60 Mode"); snprintf(current_item->text, sizeof(current_item->text), "PAL60 Mode");
snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_PAL_TEMPORAL_ENABLE)) ? "ON" : "OFF"); snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_PAL_TEMPORAL_ENABLE)) ? "ON" : "OFF");
snprintf(current_item->comment, sizeof(current_item->comment), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_PAL_TEMPORAL_ENABLE)) ? "INFO - [PAL60 Mode] is set to 'ON'.\nconverts frames from 60Hz to 50Hz." : "INFO - [PAL60 Mode is set to 'OFF'.\nframes are not converted."); snprintf(current_item->comment, sizeof(current_item->comment), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_PAL_TEMPORAL_ENABLE)) ? "INFO - [PAL60 Mode] is set to 'ON'.\nconverts frames from 60Hz to 50Hz." : "INFO - [PAL60 Mode is set to 'OFF'.\nframes are not converted.");
break; break;
@ -169,17 +169,17 @@ static void populate_setting_item(void *data, unsigned input)
break; break;
case SETTING_EMU_LOW_RAM_MODE_ENABLE: case SETTING_EMU_LOW_RAM_MODE_ENABLE:
snprintf(current_item->text, sizeof(current_item->text), "Low RAM Mode"); snprintf(current_item->text, sizeof(current_item->text), "Low RAM Mode");
if (g_extern.lifecycle_mode_state & (1ULL <<MODE_MENU_LOW_RAM_MODE_ENABLE) || if (g_extern.lifecycle_mode_state & (1ULL <<MODE_MENU_LOW_RAM_MODE_ENABLE) ||
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))
{ {
snprintf(current_item->setting_text, sizeof(current_item->setting_text), "ON"); snprintf(current_item->setting_text, sizeof(current_item->setting_text), "ON");
snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Will load skin at startup."); snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Will load skin at startup.");
} }
else else
{ {
snprintf(current_item->setting_text, sizeof(current_item->setting_text), "OFF"); snprintf(current_item->setting_text, sizeof(current_item->setting_text), "OFF");
snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Will not load skin at startup to save up on RAM."); snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Will not load skin at startup to save up on RAM.");
} }
break; break;
case SETTING_FONT_SIZE: case SETTING_FONT_SIZE:
snprintf(current_item->text, sizeof(current_item->text), "Font Size"); snprintf(current_item->text, sizeof(current_item->text), "Font Size");
@ -1047,7 +1047,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_PAL_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_PAL_ENABLE))
{ {
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_PAL_TEMPORAL_ENABLE); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_PAL_TEMPORAL_ENABLE);
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_PAL_VSYNC_BLOCK); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_PAL_VSYNC_BLOCK);
driver.video->restart(); driver.video->restart();
} }
} }
@ -1132,22 +1132,22 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
else else
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))
rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
} }
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
if (!(g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_LOW_RAM_MODE_ENABLE))) if (!(g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_LOW_RAM_MODE_ENABLE)))
{ {
if (!(g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_LOW_RAM_MODE_ENABLE_PENDING))) if (!(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); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_LOW_RAM_MODE_ENABLE);
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))
rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
} }
} }
} }
break; break;
@ -2458,8 +2458,8 @@ int ingame_menu(void *data, void *state)
} }
/*============================================================ /*============================================================
INPUT POLL CALLBACK INPUT POLL CALLBACK
============================================================ */ ============================================================ */
void rmenu_input_poll(void *data, void *state) void rmenu_input_poll(void *data, void *state)
{ {
@ -2514,8 +2514,8 @@ void rmenu_input_poll(void *data, void *state)
} }
/*============================================================ /*============================================================
INPUT PROCESS CALLBACK INPUT PROCESS CALLBACK
============================================================ */ ============================================================ */
int rmenu_input_process(void *data, void *state) int rmenu_input_process(void *data, void *state)
{ {
@ -2562,8 +2562,8 @@ int rmenu_input_process(void *data, void *state)
} }
/*============================================================ /*============================================================
RESOURCE CALLBACKS RESOURCE CALLBACKS
============================================================ */ ============================================================ */
void init_filebrowser(void *data) void init_filebrowser(void *data)
{ {
@ -2586,8 +2586,8 @@ void free_filebrowser(void *data)
} }
/*============================================================ /*============================================================
RMENU API RMENU API
============================================================ */ ============================================================ */
void menu_init(void) void menu_init(void)
@ -2640,23 +2640,23 @@ bool rmenu_iterate(void)
rmenu_default_positions_t default_pos; rmenu_default_positions_t default_pos;
device_ptr->ctx_driver->rmenu_set_default_pos(&default_pos); device_ptr->ctx_driver->rmenu_set_default_pos(&default_pos);
if ((g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_LOW_RAM_MODE_ENABLE))) if ((g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_LOW_RAM_MODE_ENABLE)))
{ {
#if defined(HAVE_OPENGL) #if defined(HAVE_OPENGL)
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
#elif defined(HAVE_D3D8) || defined(HAVE_D3D9) #elif defined(HAVE_D3D8) || defined(HAVE_D3D9)
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data; xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data;
LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->d3d_render_device; LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->d3d_render_device;
d3dr->Clear(0, NULL, D3DCLEAR_TARGET, 0xff000000, 1.0f, 0); d3dr->Clear(0, NULL, D3DCLEAR_TARGET, 0xff000000, 1.0f, 0);
#endif #endif
} }
else else
{ {
if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_DRAW)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_DRAW))
device_ptr->ctx_driver->set_blend(true); device_ptr->ctx_driver->set_blend(true);
rarch_render_cached_frame(); rarch_render_cached_frame();
} }
if(current_menu.input_poll) if(current_menu.input_poll)
rmenu_input_poll(&current_menu, &rmenu_state); rmenu_input_poll(&current_menu, &rmenu_state);

BIN
media/xbox1/Thumbs.db
View File

Binary file not shown.