From 145bad0b360d9013cbabd890f66a98f7fc686b0c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 17 Feb 2013 22:02:42 +0100 Subject: [PATCH] (RMenu) Indent fixes --- frontend/menu/rmenu.c | 90 +++++++++++++++++++++--------------------- media/xbox1/Thumbs.db | Bin 7168 -> 0 bytes 2 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 media/xbox1/Thumbs.db diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index bb572a3bff..144ea4c453 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -111,8 +111,8 @@ enum }; /*============================================================ -EVENT CALLBACKS (AND RELATED) -============================================================ */ + EVENT CALLBACKS (AND RELATED) + ============================================================ */ static void populate_setting_item(void *data, unsigned input) { @@ -136,7 +136,7 @@ static void populate_setting_item(void *data, unsigned input) } break; 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->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; @@ -169,17 +169,17 @@ static void populate_setting_item(void *data, unsigned input) break; case SETTING_EMU_LOW_RAM_MODE_ENABLE: snprintf(current_item->text, sizeof(current_item->text), "Low RAM Mode"); - if (g_extern.lifecycle_mode_state & (1ULL <setting_text, sizeof(current_item->setting_text), "ON"); - snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Will load skin at startup."); - } - else - { - 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."); - } + if (g_extern.lifecycle_mode_state & (1ULL <setting_text, sizeof(current_item->setting_text), "ON"); + snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Will load skin at startup."); + } + else + { + 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."); + } break; case SETTING_FONT_SIZE: snprintf(current_item->text, sizeof(current_item->text), "Font Size"); @@ -996,7 +996,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input) (void)data; DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data; filebrowser_t *filebrowser = tmpBrowser; - + switch(switchvalue) { #ifdef __CELLOS_LV2__ @@ -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)) { 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(); } } @@ -1132,22 +1132,22 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input) else g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_LOW_RAM_MODE_ENABLE_PENDING); - if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) - rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); + if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) + rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); } } 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_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_PENDING); - + if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); - } + } } } break; @@ -1522,7 +1522,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input) #else snprintf(g_settings.audio.resampler, sizeof(g_settings.audio.resampler), "hermite"); #endif - + if (g_extern.main_is_init) { if (!rarch_resampler_realloc(&g_extern.audio_data.resampler_data, &g_extern.audio_data.resampler, @@ -2164,7 +2164,7 @@ int ingame_menu_screenshot(void *data, void *state) rmenu_state_t *rstate = (rmenu_state_t*)state; uint64_t input = rstate->input; - + DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data; filebrowser_t *filebrowser = NULL; @@ -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) { @@ -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) { @@ -2562,8 +2562,8 @@ int rmenu_input_process(void *data, void *state) } /*============================================================ -RESOURCE CALLBACKS -============================================================ */ + RESOURCE CALLBACKS + ============================================================ */ void init_filebrowser(void *data) { @@ -2586,8 +2586,8 @@ void free_filebrowser(void *data) } /*============================================================ -RMENU API -============================================================ */ + RMENU API + ============================================================ */ void menu_init(void) @@ -2640,23 +2640,23 @@ bool rmenu_iterate(void) rmenu_default_positions_t 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) - glClear(GL_COLOR_BUFFER_BIT); + glClear(GL_COLOR_BUFFER_BIT); #elif defined(HAVE_D3D8) || defined(HAVE_D3D9) - xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data; - LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->d3d_render_device; - d3dr->Clear(0, NULL, D3DCLEAR_TARGET, 0xff000000, 1.0f, 0); + xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data; + LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->d3d_render_device; + d3dr->Clear(0, NULL, D3DCLEAR_TARGET, 0xff000000, 1.0f, 0); #endif -} -else -{ - if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_DRAW)) - device_ptr->ctx_driver->set_blend(true); + } + else + { + if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_DRAW)) + device_ptr->ctx_driver->set_blend(true); - rarch_render_cached_frame(); -} + rarch_render_cached_frame(); + } if(current_menu.input_poll) rmenu_input_poll(¤t_menu, &rmenu_state); diff --git a/media/xbox1/Thumbs.db b/media/xbox1/Thumbs.db deleted file mode 100644 index 981c0cd92c1171a9b023aea0b070ad48fdec7acc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7168 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