diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c index 439029518c..f11535e4c3 100644 --- a/gfx/common/win32_common.c +++ b/gfx/common/win32_common.c @@ -2119,7 +2119,7 @@ static void win32_localize_menu(HMENU menu) memset(&menu_item_info, 0, sizeof(menu_item_info)); menu_item_info.cbSize = sizeof(menu_item_info); menu_item_info.dwTypeData = NULL; -#if(WINVER >= 0x0500) +#if (WINVER >= 0x0500) menu_item_info.fMask = MIIM_STRING | MIIM_FTYPE | MIIM_ID | MIIM_STATE | MIIM_SUBMENU; #else menu_item_info.fMask = MIIM_ID | MIIM_STATE | MIIM_SUBMENU; diff --git a/gfx/drivers/d3d12.c b/gfx/drivers/d3d12.c index 17ae8fc5bc..1a702fafc6 100644 --- a/gfx/drivers/d3d12.c +++ b/gfx/drivers/d3d12.c @@ -3514,7 +3514,7 @@ static bool d3d12_gfx_frame( if (d3d12->flags & D3D12_ST_FLAG_RESIZE_RTS) d3d12_init_render_targets(d3d12, width, height); - if(frame == RETRO_HW_FRAME_BUFFER_VALID) + if (frame == RETRO_HW_FRAME_BUFFER_VALID) { D3D12_BOX src_box; D3D12_TEXTURE_COPY_LOCATION src, dst; diff --git a/gfx/drivers/gl_shaders/pipeline_snowflake.glsl.frag.h b/gfx/drivers/gl_shaders/pipeline_snowflake.glsl.frag.h index 64ed81a0f7..db69949c0b 100644 --- a/gfx/drivers/gl_shaders/pipeline_snowflake.glsl.frag.h +++ b/gfx/drivers/gl_shaders/pipeline_snowflake.glsl.frag.h @@ -28,17 +28,13 @@ static const char* stock_fragment_xmb_snowflake = GLSL( float dist = d.x*d.x + d.y*d.y; - if(dist < pos.z/400.0) + if (dist < pos.z/400.0) { float col = 0.0; - if(sin(a * 8.0) < 0.0) - { + if (sin(a * 8.0) < 0.0) col=1.0; - } - if(dist < pos.z/800.0) - { + if (dist < pos.z/800.0) col+=1.0; - } return col * pos.z; } diff --git a/gfx/drivers/gx2_shaders/bokeh.frag b/gfx/drivers/gx2_shaders/bokeh.frag index 29a8d48116..5462baab42 100644 --- a/gfx/drivers/gx2_shaders/bokeh.frag +++ b/gfx/drivers/gx2_shaders/bokeh.frag @@ -11,26 +11,25 @@ layout(location = 0) out vec4 FragColor; void main(void) { + float speed = global.time * 4.0; + vec2 uv = -1.0 + 2.0 * gl_FragCoord.xy / global.OutputSize; + uv.x *= global.OutputSize.x / global.OutputSize.y; + vec3 color = vec3(0.0); - float speed = global.time * 4.0; - vec2 uv = -1.0 + 2.0 * gl_FragCoord.xy / global.OutputSize; - uv.x *= global.OutputSize.x / global.OutputSize.y; - vec3 color = vec3(0.0); - -for( int i=0; i < 6; i++ ) + for( int i=0; i < 6; i++ ) + { + float pha = sin(float(i) * 546.13 + 1.0) * 0.5 + 0.5; + float siz = pow(sin(float(i) * 651.74 + 5.0) * 0.5 + 0.5, 4.0); + float pox = sin(float(i) * 321.55 + 4.1) * global.OutputSize.x / global.OutputSize.y; + float rad = 0.1 + 0.5 * siz + sin(pha + siz) / 4.0; + vec2 pos = vec2(pox + sin(speed / 15. + pha + siz), - 1.0 - rad + (2.0 + 2.0 * rad) * fract(pha + 0.3 * (speed / 7.) * (0.2 + 0.8 * siz))); + float dis = length(uv - pos); + if (dis < rad) { - float pha = sin(float(i) * 546.13 + 1.0) * 0.5 + 0.5; - float siz = pow(sin(float(i) * 651.74 + 5.0) * 0.5 + 0.5, 4.0); - float pox = sin(float(i) * 321.55 + 4.1) * global.OutputSize.x / global.OutputSize.y; - float rad = 0.1 + 0.5 * siz + sin(pha + siz) / 4.0; - vec2 pos = vec2(pox + sin(speed / 15. + pha + siz), - 1.0 - rad + (2.0 + 2.0 * rad) * fract(pha + 0.3 * (speed / 7.) * (0.2 + 0.8 * siz))); - float dis = length(uv - pos); - if(dis < rad) - { - vec3 col = mix(vec3(0.194 * sin(speed / 6.0) + 0.3, 0.2, 0.3 * pha), vec3(1.1 * sin(speed / 9.0) + 0.3, 0.2 * pha, 0.4), 0.5 + 0.5 * sin(float(i))); - color += col.zyx * (1.0 - smoothstep(rad * 0.15, rad, dis)); - } + vec3 col = mix(vec3(0.194 * sin(speed / 6.0) + 0.3, 0.2, 0.3 * pha), vec3(1.1 * sin(speed / 9.0) + 0.3, 0.2 * pha, 0.4), 0.5 + 0.5 * sin(float(i))); + color += col.zyx * (1.0 - smoothstep(rad * 0.15, rad, dis)); } - color *= sqrt(1.5 - 0.5 * length(uv)); + } + color *= sqrt(1.5 - 0.5 * length(uv)); FragColor = vec4(color.r, color.g, color.b , 0.5); } diff --git a/gfx/drivers/gx2_shaders/snowflake.frag b/gfx/drivers/gx2_shaders/snowflake.frag index a3934e4f24..a8bf1db107 100644 --- a/gfx/drivers/gx2_shaders/snowflake.frag +++ b/gfx/drivers/gx2_shaders/snowflake.frag @@ -29,17 +29,13 @@ float snow(vec3 pos, vec2 uv, float o) float dist = d.x*d.x + d.y*d.y; - if(dist < pos.z/400.0) + if (dist < pos.z/400.0) { float col = 0.0; if(sin(a * 8.0) < 0.0) - { col=1.0; - } if(dist < pos.z/800.0) - { col+=1.0; - } return col * pos.z; } diff --git a/gfx/gfx_thumbnail_path.c b/gfx/gfx_thumbnail_path.c index 5c1a92af38..76d609f724 100644 --- a/gfx/gfx_thumbnail_path.c +++ b/gfx/gfx_thumbnail_path.c @@ -494,7 +494,7 @@ bool gfx_thumbnail_set_content_playlist( sizeof(path_data->content_img), path_data->content_label, false); /* Explicit zero if full name is same as standard name - saves some queries later. */ - if(string_is_equal(path_data->content_img, path_data->content_img_full)) + if (string_is_equal(path_data->content_img, path_data->content_img_full)) path_data->content_img_full[0] = '\0'; gfx_thumbnail_fill_content_img(path_data->content_img_short, @@ -572,7 +572,7 @@ bool gfx_thumbnail_update_path( bool playlist_allow_non_png = settings->bools.playlist_allow_non_png; unsigned gfx_thumbnails = settings->uints.gfx_thumbnails; unsigned menu_left_thumbnails = settings->uints.menu_left_thumbnails; - unsigned menu_icon_thumbnails = settings->uints.menu_icon_thumbnails; + unsigned menu_icon_thumbnails = settings->uints.menu_icon_thumbnails; /* Thumbnail extension order. The default (i.e. png) is always the first. */ #define MAX_SUPPORTED_THUMBNAIL_EXTENSIONS 5 const char* const SUPPORTED_THUMBNAIL_EXTENSIONS[] = { ".png", ".jpg", ".jpeg", ".bmp", ".tga", 0 }; diff --git a/input/drivers/test_input.c b/input/drivers/test_input.c index c20a202919..bc66f86155 100644 --- a/input/drivers/test_input.c +++ b/input/drivers/test_input.c @@ -412,9 +412,9 @@ static void test_input_poll(void *data) { if (!input_test_steps[i].handled && curr_frame > input_test_steps[i].frame) { - if( input_test_steps[i].action == INPUT_TEST_COMMAND_PRESS_KEY) + if (input_test_steps[i].action == INPUT_TEST_COMMAND_PRESS_KEY) { - if(input_test_steps[i].param_num < RETROK_LAST) + if (input_test_steps[i].param_num < RETROK_LAST) { test_key_state[DEFAULT_MAX_PADS][input_test_steps[i].param_num] = 1; input_keyboard_event(true, input_test_steps[i].param_num, 0, 0, RETRO_DEVICE_KEYBOARD); @@ -424,9 +424,9 @@ static void test_input_poll(void *data) "[Test input driver]: Pressing keyboard button %d at frame %d\n", input_test_steps[i].param_num, curr_frame); } - else if( input_test_steps[i].action == INPUT_TEST_COMMAND_RELEASE_KEY) + else if (input_test_steps[i].action == INPUT_TEST_COMMAND_RELEASE_KEY) { - if(input_test_steps[i].param_num < RETROK_LAST) + if (input_test_steps[i].param_num < RETROK_LAST) { test_key_state[DEFAULT_MAX_PADS][input_test_steps[i].param_num] = 0; input_keyboard_event(false, input_test_steps[i].param_num, 0, 0, RETRO_DEVICE_KEYBOARD); @@ -436,9 +436,9 @@ static void test_input_poll(void *data) "[Test input driver]: Releasing keyboard button %d at frame %d\n", input_test_steps[i].param_num, curr_frame); } - else if(input_test_steps[i].action == INPUT_TEST_COMMAND_SET_SENSOR_ACC_X || - input_test_steps[i].action == INPUT_TEST_COMMAND_SET_SENSOR_ACC_Y || - input_test_steps[i].action == INPUT_TEST_COMMAND_SET_SENSOR_ACC_Z) + else if ( input_test_steps[i].action == INPUT_TEST_COMMAND_SET_SENSOR_ACC_X + || input_test_steps[i].action == INPUT_TEST_COMMAND_SET_SENSOR_ACC_Y + || input_test_steps[i].action == INPUT_TEST_COMMAND_SET_SENSOR_ACC_Z) { float setval = test_input_unsigned_to_float_acc(input_test_steps[i].param_num); switch (input_test_steps[i].action) @@ -458,9 +458,9 @@ static void test_input_poll(void *data) "[Test input driver]: Setting accelerometer axis %d to %f at frame %d\n", input_test_steps[i].action - INPUT_TEST_COMMAND_SET_SENSOR_ACC_X, setval, curr_frame); } - else if(input_test_steps[i].action == INPUT_TEST_COMMAND_SET_SENSOR_GYR_X || - input_test_steps[i].action == INPUT_TEST_COMMAND_SET_SENSOR_GYR_Y || - input_test_steps[i].action == INPUT_TEST_COMMAND_SET_SENSOR_GYR_Z) + else if ( input_test_steps[i].action == INPUT_TEST_COMMAND_SET_SENSOR_GYR_X + || input_test_steps[i].action == INPUT_TEST_COMMAND_SET_SENSOR_GYR_Y + || input_test_steps[i].action == INPUT_TEST_COMMAND_SET_SENSOR_GYR_Z) { float setval = test_input_unsigned_to_float_gyro(input_test_steps[i].param_num); switch (input_test_steps[i].action) @@ -480,7 +480,7 @@ static void test_input_poll(void *data) "[Test input driver]: Setting gyroscope axis %d to %f at frame %d\n", input_test_steps[i].action - INPUT_TEST_COMMAND_SET_SENSOR_GYR_X, setval, curr_frame); } - else if(input_test_steps[i].action == INPUT_TEST_COMMAND_SET_SENSOR_LUX) + else if (input_test_steps[i].action == INPUT_TEST_COMMAND_SET_SENSOR_LUX) { float setval = test_input_unsigned_to_float_lux(input_test_steps[i].param_num); test_input_values.lux_sensor_state = setval; @@ -510,23 +510,23 @@ static bool test_input_set_sensor_state(void *data, unsigned port, static float test_input_get_sensor_input(void *data, unsigned port, unsigned id) { - switch (id) - { - case RETRO_SENSOR_ACCELEROMETER_X: - return test_input_values.accelerometer_state.x; - case RETRO_SENSOR_ACCELEROMETER_Y: - return test_input_values.accelerometer_state.y; - case RETRO_SENSOR_ACCELEROMETER_Z: - return test_input_values.accelerometer_state.z; - case RETRO_SENSOR_GYROSCOPE_X: - return test_input_values.gyroscope_state.x; - case RETRO_SENSOR_GYROSCOPE_Y: - return test_input_values.gyroscope_state.y; - case RETRO_SENSOR_GYROSCOPE_Z: - return test_input_values.gyroscope_state.z; - case RETRO_SENSOR_ILLUMINANCE: - return test_input_values.lux_sensor_state; - } + switch (id) + { + case RETRO_SENSOR_ACCELEROMETER_X: + return test_input_values.accelerometer_state.x; + case RETRO_SENSOR_ACCELEROMETER_Y: + return test_input_values.accelerometer_state.y; + case RETRO_SENSOR_ACCELEROMETER_Z: + return test_input_values.accelerometer_state.z; + case RETRO_SENSOR_GYROSCOPE_X: + return test_input_values.gyroscope_state.x; + case RETRO_SENSOR_GYROSCOPE_Y: + return test_input_values.gyroscope_state.y; + case RETRO_SENSOR_GYROSCOPE_Z: + return test_input_values.gyroscope_state.z; + case RETRO_SENSOR_ILLUMINANCE: + return test_input_values.lux_sensor_state; + } return 0.0f; } diff --git a/input/drivers_joypad/test_joypad.c b/input/drivers_joypad/test_joypad.c index d5a72b8822..c4c93c2b07 100644 --- a/input/drivers_joypad/test_joypad.c +++ b/input/drivers_joypad/test_joypad.c @@ -394,9 +394,7 @@ static int16_t test_joypad_state( ? binds[i].joykey : joypad_info->auto_binds[i].joykey; /* Test input driver uses same button layout internally as RA, so no conversion is needed */ if (joykey != NO_BTN && (test_joypads[port_idx].button_state & (1 << i))) - { ret |= ( 1 << i); - } } } @@ -426,8 +424,8 @@ static void test_joypad_poll(void) test_joypad_autodetect_remove(input_test_steps[i].param_num); input_test_steps[i].handled = true; } - else if( input_test_steps[i].action >= JOYPAD_TEST_COMMAND_BUTTON_PRESS_FIRST && - input_test_steps[i].action <= JOYPAD_TEST_COMMAND_BUTTON_PRESS_LAST) + else if ( input_test_steps[i].action >= JOYPAD_TEST_COMMAND_BUTTON_PRESS_FIRST + && input_test_steps[i].action <= JOYPAD_TEST_COMMAND_BUTTON_PRESS_LAST) { unsigned targetpad = input_test_steps[i].action - JOYPAD_TEST_COMMAND_BUTTON_PRESS_FIRST; test_joypads[targetpad].button_state |= input_test_steps[i].param_num; @@ -436,8 +434,8 @@ static void test_joypad_poll(void) "[Test joypad driver]: Pressing device %d buttons %x, new state %x.\n", targetpad,input_test_steps[i].param_num,test_joypads[targetpad].button_state); } - else if( input_test_steps[i].action >= JOYPAD_TEST_COMMAND_BUTTON_RELEASE_FIRST && - input_test_steps[i].action <= JOYPAD_TEST_COMMAND_BUTTON_RELEASE_LAST) + else if ( input_test_steps[i].action >= JOYPAD_TEST_COMMAND_BUTTON_RELEASE_FIRST + && input_test_steps[i].action <= JOYPAD_TEST_COMMAND_BUTTON_RELEASE_LAST) { unsigned targetpad = input_test_steps[i].action - JOYPAD_TEST_COMMAND_BUTTON_RELEASE_FIRST; test_joypads[targetpad].button_state &= ~input_test_steps[i].param_num; @@ -446,8 +444,8 @@ static void test_joypad_poll(void) "[Test joypad driver]: Releasing device %d buttons %x, new state %x.\n", targetpad,input_test_steps[i].param_num,test_joypads[targetpad].button_state); } - else if( input_test_steps[i].action >= JOYPAD_TEST_COMMAND_BUTTON_AXIS_FIRST && - input_test_steps[i].action <= JOYPAD_TEST_COMMAND_BUTTON_AXIS_LAST) + else if ( input_test_steps[i].action >= JOYPAD_TEST_COMMAND_BUTTON_AXIS_FIRST + && input_test_steps[i].action <= JOYPAD_TEST_COMMAND_BUTTON_AXIS_LAST) { unsigned targetpad = (input_test_steps[i].action - JOYPAD_TEST_COMMAND_BUTTON_AXIS_FIRST) / MAX_AXIS; @@ -482,10 +480,7 @@ static bool test_joypad_query_pad(unsigned pad) return (pad < MAX_USERS); } -static void test_joypad_destroy(void) -{ - -} +static void test_joypad_destroy(void) { } input_device_driver_t test_joypad = { test_joypad_init, diff --git a/libretro-db/lua/lua_common.c b/libretro-db/lua/lua_common.c index f86c41968d..75fd255e23 100644 --- a/libretro-db/lua/lua_common.c +++ b/libretro-db/lua/lua_common.c @@ -139,7 +139,7 @@ set_nil: int j; for (j = 0; j < out->val.map.len; j++) { - if(string_is_equal(ordered_keys[i], out->val.map.items[j].key.val.string.buff)) + if (string_is_equal(ordered_keys[i], out->val.map.items[j].key.val.string.buff)) { *ordered_pairs_outp++ = out->val.map.items[j]; break; diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 0307062791..50ddf3ad4c 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -6010,7 +6010,7 @@ static int action_ok_add_entry_to_playlist(const char *path, return 0; if (!menu) return -1; - if(!label) + if (!label) return 0; /* @@ -6148,7 +6148,7 @@ static void action_input_add_entry_to_new_playlist(void *userdata, const char *l menu_input_dialog_end(); - if(!line) + if (!line) return; /* Create path for new file */ @@ -6165,7 +6165,7 @@ static void action_input_add_entry_to_new_playlist_quickmenu(void *userdata, con menu_input_dialog_end(); - if(!line) + if (!line) return; /* Create path for new file */ diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c index f2a817d841..248781f1b8 100644 --- a/menu/cbs/menu_cbs_start.c +++ b/menu/cbs/menu_cbs_start.c @@ -82,9 +82,7 @@ static int action_start_remap_file_info( unsigned type, size_t idx, size_t entry_idx) { struct menu_state *menu_st = menu_state_get_ptr(); - settings_t *settings = config_get_ptr(); - const char *directory_input_remapping = settings ? - settings->paths.directory_input_remapping : NULL; + const char *directory_input_remapping = config_get_ptr()->paths.directory_input_remapping; rarch_system_info_t *sys_info = &runloop_state_get_ptr()->system; input_remapping_deinit(false); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index c4fc5e7ee0..3b3eaf3740 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1619,7 +1619,7 @@ static bool gfx_thumbnail_set_icon_playlist( sizeof(path_data->content_img), path_data->content_label, false); /* Explicit zero if full name is same as standard name - saves some queries later. */ - if(string_is_equal(path_data->content_img, path_data->content_img_full)) + if (string_is_equal(path_data->content_img, path_data->content_img_full)) path_data->content_img_full[0] = '\0'; gfx_thumbnail_fill_content_img(path_data->content_img_short, diff --git a/menu/menu_setting.c b/menu/menu_setting.c index f659eeb781..212aee09d3 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5875,7 +5875,7 @@ static int setting_uint_action_right_custom_vp_height( settings_t *settings = config_get_ptr(); video_viewport_t *custom = &settings->video_vp_custom; - if (!settings || !av_info) + if (!av_info) return -1; video_driver_get_viewport_info(&vp); @@ -5994,7 +5994,7 @@ static int setting_string_action_right_driver( if (!success) { settings_t *settings = config_get_ptr(); - bool menu_navigation_wraparound_enable = settings ? settings->bools.menu_navigation_wraparound_enable: false; + bool menu_navigation_wraparound_enable = settings->bools.menu_navigation_wraparound_enable; if (menu_navigation_wraparound_enable) { @@ -6386,7 +6386,8 @@ static size_t setting_get_string_representation_video_frame_delay( _len += strlcpy(s + _len, target_unit, len - _len); if (*setting->value.target.unsigned_integer >= 20) _len += snprintf(s + _len, len - _len, " (%ums)", - (unsigned)(1 / settings->floats.video_refresh_rate * 1000 * (*setting->value.target.unsigned_integer / 100.0f))); + (unsigned)(1 / settings->floats.video_refresh_rate + * 1000 * (*setting->value.target.unsigned_integer / 100.0f))); } return _len; } @@ -6814,10 +6815,10 @@ static size_t setting_get_string_representation_android_physical_keyboard( { if (setting) { - settings_t *settings = config_get_ptr(); int keyboard_vendor_id; int keyboard_product_id; - if (sscanf(setting->value.target.string, "%04x:%04x ", &keyboard_vendor_id, &keyboard_product_id) != 2) + if (sscanf(setting->value.target.string, "%04x:%04x ", + &keyboard_vendor_id, &keyboard_product_id) != 2) return strlcpy(s, setting->value.target.string, len); return strlcpy(s, &setting->value.target.string[10], len); } @@ -7294,10 +7295,9 @@ int menu_action_handle_setting(rarch_setting_t *setting, /** * menu_setting_find: - * @settings : pointer to settings - * @name : name of setting to search for + * @label : name of setting to search for * - * Search for a setting with a specified name (@name). + * Search for a setting with a specified name (@label). * * Returns: pointer to setting if found, NULL otherwise. **/ @@ -7483,13 +7483,14 @@ static int setting_action_start_custom_vp_height(rarch_setting_t *setting) struct retro_system_av_info *av_info = &video_st->av_info; settings_t *settings = config_get_ptr(); video_viewport_t *custom = &settings->video_vp_custom; + bool video_scale_integer = settings->bools.video_scale_integer; - if (!settings || !av_info) + if (!av_info) return -1; video_driver_get_viewport_info(&vp); - if (settings->bools.video_scale_integer) + if (video_scale_integer) { struct retro_game_geometry *geom = (struct retro_game_geometry*) &av_info->geometry; @@ -8151,8 +8152,10 @@ static void general_write_handler(rarch_setting_t *setting) 1); /* Set reasonable default for dark frames for current BFI value. - Even results OR odd 60hz multiples should be mostly immune to lcd voltage retention. - Nothing to be done for 120hz except phase retention usage if needed. */ + Even results OR odd 60Hz multiples should be mostly immune + to LCD voltage retention. + Nothing to be done for 120hz except phase retention usage + if needed. */ if (*setting->value.target.unsigned_integer == 1) { configuration_set_uint(settings, @@ -8249,7 +8252,7 @@ static void general_write_handler(rarch_setting_t *setting) enum dingux_refresh_rate target_refresh_rate = (enum dingux_refresh_rate)settings->uints.video_dingux_refresh_rate; - bool refresh_rate_valid = false; + bool refresh_rate_valid = false; /* Get current refresh rate */ refresh_rate_valid = dingux_get_video_refresh_rate(¤t_refresh_rate); @@ -8303,7 +8306,8 @@ static void general_write_handler(rarch_setting_t *setting) settings->floats.video_hdr_max_nits = roundf(*setting->value.target.fraction); if (video_st && video_st->poke && video_st->poke->set_hdr_max_nits) - video_st->poke->set_hdr_max_nits(video_st->data, settings->floats.video_hdr_max_nits); + video_st->poke->set_hdr_max_nits(video_st->data, + settings->floats.video_hdr_max_nits); } break; case MENU_ENUM_LABEL_VIDEO_HDR_PAPER_WHITE_NITS: @@ -8315,7 +8319,8 @@ static void general_write_handler(rarch_setting_t *setting) if (video_st && video_st->poke && video_st->poke->set_hdr_paper_white_nits) - video_st->poke->set_hdr_paper_white_nits(video_st->data, settings->floats.video_hdr_paper_white_nits); + video_st->poke->set_hdr_paper_white_nits(video_st->data, + settings->floats.video_hdr_paper_white_nits); } break; case MENU_ENUM_LABEL_VIDEO_HDR_CONTRAST: @@ -8325,7 +8330,8 @@ static void general_write_handler(rarch_setting_t *setting) settings->floats.video_hdr_display_contrast = *setting->value.target.fraction; if (video_st && video_st->poke && video_st->poke->set_hdr_contrast) - video_st->poke->set_hdr_contrast(video_st->data, VIDEO_HDR_MAX_CONTRAST - settings->floats.video_hdr_display_contrast); + video_st->poke->set_hdr_contrast(video_st->data, + VIDEO_HDR_MAX_CONTRAST - settings->floats.video_hdr_display_contrast); } break; case MENU_ENUM_LABEL_VIDEO_HDR_EXPAND_GAMUT: @@ -8335,7 +8341,8 @@ static void general_write_handler(rarch_setting_t *setting) settings->bools.video_hdr_expand_gamut = *setting->value.target.boolean; if (video_st && video_st->poke && video_st->poke->set_hdr_expand_gamut) - video_st->poke->set_hdr_expand_gamut(video_st->data, settings->bools.video_hdr_expand_gamut); + video_st->poke->set_hdr_expand_gamut(video_st->data, + settings->bools.video_hdr_expand_gamut); } break; case MENU_ENUM_LABEL_INPUT_MAX_USERS: @@ -8344,7 +8351,9 @@ static void general_write_handler(rarch_setting_t *setting) #ifdef ANDROID case MENU_ENUM_LABEL_INPUT_SELECT_PHYSICAL_KEYBOARD: settings->flags |= SETTINGS_FLG_MODIFIED; - strlcpy(settings->arrays.input_android_physical_keyboard, setting->value.target.string, sizeof(settings->arrays.input_android_physical_keyboard)); + strlcpy(settings->arrays.input_android_physical_keyboard, + setting->value.target.string, + sizeof(settings->arrays.input_android_physical_keyboard)); break; #endif case MENU_ENUM_LABEL_LOG_TO_FILE: @@ -8727,8 +8736,8 @@ static void general_write_handler(rarch_setting_t *setting) * force a cache refresh on the next * core info initialisation */ if (*setting->value.target.boolean) - if (!core_info_cache_force_refresh(!string_is_empty(path_libretro_info) ? - path_libretro_info : dir_libretro)) + if (!core_info_cache_force_refresh(!string_is_empty(path_libretro_info) + ? path_libretro_info : dir_libretro)) { const char *_msg = msg_hash_to_str(MSG_CORE_INFO_CACHE_UNSUPPORTED); /* core_info_cache_force_refresh() will fail @@ -8818,16 +8827,16 @@ static void frontend_log_level_change_handler(rarch_setting_t *setting) #ifdef HAVE_RUNAHEAD static void runahead_change_handler(rarch_setting_t *setting) { +#if (defined(HAVE_DYNAMIC) || defined(HAVE_DYLIB)) + bool secondary_instance; + bool run_ahead_enabled; +#endif + bool preempt_enable; settings_t *settings = config_get_ptr(); struct menu_state *menu_st = menu_state_get_ptr(); runloop_state_t *runloop_st = runloop_state_get_ptr(); preempt_t *preempt = runloop_st->preempt_data; unsigned run_ahead_frames = settings->uints.run_ahead_frames; - bool preempt_enable; -#if (defined(HAVE_DYNAMIC) || defined(HAVE_DYLIB)) - bool secondary_instance; - bool run_ahead_enabled; -#endif if (!setting) return; @@ -9574,15 +9583,15 @@ static bool setting_append_list_input_remap_port_options( rarch_setting_info_t *list_info, const char *parent_group) { - settings_t *settings = config_get_ptr(); + unsigned user; rarch_setting_group_info_t group_info; rarch_setting_group_info_t subgroup_info; static char key_port[MAX_USERS][64]; static char label_port[MAX_USERS][64]; - unsigned user; + settings_t *settings = config_get_ptr(); - group_info.name = NULL; - subgroup_info.name = NULL; + group_info.name = NULL; + subgroup_info.name = NULL; START_GROUP(list, list_info, &group_info, "Mapped Ports", parent_group); @@ -9881,7 +9890,10 @@ static bool setting_append_list( } #endif - if (string_is_not_equal(settings->arrays.menu_driver, "xmb") && string_is_not_equal(settings->arrays.menu_driver, "ozone")) +#if defined(HAVE_XMB) || defined(HAVE_OZONE) + if ( string_is_not_equal(settings->arrays.menu_driver, "xmb") + && string_is_not_equal(settings->arrays.menu_driver, "ozone")) +#endif { CONFIG_ACTION( list, list_info, @@ -11191,7 +11203,9 @@ static bool setting_append_list( uint8_t i, listing = 0; struct bool_entry bool_entries[12]; - START_GROUP(list, list_info, &group_info, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS), parent_group); + START_GROUP(list, list_info, &group_info, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS), + parent_group); parent_group = msg_hash_to_str(MENU_ENUM_LABEL_SAVING_SETTINGS); START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, @@ -11822,7 +11836,9 @@ static bool setting_append_list( break; case SETTINGS_LIST_CHEATS: { - START_GROUP(list, list_info, &group_info, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CHEAT_SETTINGS), parent_group); + START_GROUP(list, list_info, &group_info, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CHEAT_SETTINGS), + parent_group); parent_group = msg_hash_to_str(MENU_ENUM_LABEL_CHEAT_SETTINGS); @@ -12325,7 +12341,9 @@ static bool setting_append_list( case SETTINGS_LIST_VIDEO: { struct video_viewport *custom_vp = &settings->video_vp_custom; - START_GROUP(list, list_info, &group_info, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS), parent_group); + START_GROUP(list, list_info, &group_info, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS), + parent_group); MENU_SETTINGS_LIST_CURRENT_ADD_ENUM_IDX_PTR(list, list_info, MENU_ENUM_LABEL_VIDEO_SETTINGS); parent_group = msg_hash_to_str(MENU_ENUM_LABEL_SETTINGS); @@ -12351,9 +12369,11 @@ static bool setting_append_list( #endif END_SUB_GROUP(list, list_info, parent_group); - START_SUB_GROUP(list, list_info, "Platform-specific", &group_info, &subgroup_info, parent_group); + START_SUB_GROUP(list, list_info, "Platform-specific", &group_info, + &subgroup_info, parent_group); - video_driver_menu_settings((void**)list, (void*)list_info, (void*)&group_info, (void*)&subgroup_info, parent_group); + video_driver_menu_settings((void**)list, (void*)list_info, + (void*)&group_info, (void*)&subgroup_info, parent_group); END_SUB_GROUP(list, list_info, parent_group); START_SUB_GROUP(list, list_info, "Monitor", &group_info, &subgroup_info, parent_group); @@ -12959,8 +12979,8 @@ static bool setting_append_list( CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); #if defined(DINGUX) - if (string_is_equal(settings->arrays.video_driver, "sdl_dingux") || - string_is_equal(settings->arrays.video_driver, "sdl_rs90")) + if ( string_is_equal(settings->arrays.video_driver, "sdl_dingux") + || string_is_equal(settings->arrays.video_driver, "sdl_rs90")) { CONFIG_BOOL( list, list_info, @@ -17890,9 +17910,9 @@ static bool setting_append_list( menu_settings_list_current_add_range(list, list_info, 0, 1800, 10, true, true); #if (defined(HAVE_MATERIALUI) || defined(HAVE_XMB) || defined(HAVE_OZONE)) && !defined(_3DS) - if (string_is_equal(settings->arrays.menu_driver, "glui") || - string_is_equal(settings->arrays.menu_driver, "xmb") || - string_is_equal(settings->arrays.menu_driver, "ozone")) + if ( string_is_equal(settings->arrays.menu_driver, "glui") + || string_is_equal(settings->arrays.menu_driver, "xmb") + || string_is_equal(settings->arrays.menu_driver, "ozone")) { CONFIG_UINT( list, list_info, @@ -17930,10 +17950,10 @@ static bool setting_append_list( } #endif #if defined(HAVE_XMB) || defined(HAVE_OZONE) || defined(HAVE_RGUI) || defined(HAVE_MATERIALUI) - if (string_is_equal(settings->arrays.menu_driver, "xmb") || - string_is_equal(settings->arrays.menu_driver, "ozone") || - string_is_equal(settings->arrays.menu_driver, "rgui") || - string_is_equal(settings->arrays.menu_driver, "glui")) + if ( string_is_equal(settings->arrays.menu_driver, "xmb") + || string_is_equal(settings->arrays.menu_driver, "ozone") + || string_is_equal(settings->arrays.menu_driver, "rgui") + || string_is_equal(settings->arrays.menu_driver, "glui")) { CONFIG_UINT( list, list_info, @@ -18445,7 +18465,8 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE); - if (string_is_equal(settings->arrays.menu_driver, "xmb") || string_is_equal(settings->arrays.menu_driver, "ozone")) + if ( string_is_equal(settings->arrays.menu_driver, "xmb") + || string_is_equal(settings->arrays.menu_driver, "ozone")) { CONFIG_BOOL( list, list_info, @@ -18505,9 +18526,9 @@ static bool setting_append_list( START_SUB_GROUP(list, list_info, "Display", &group_info, &subgroup_info, parent_group); /* > MaterialUI, XMB and Ozone all support menu scaling */ - if (string_is_equal(settings->arrays.menu_driver, "glui") || - string_is_equal(settings->arrays.menu_driver, "xmb") || - string_is_equal(settings->arrays.menu_driver, "ozone")) + if ( string_is_equal(settings->arrays.menu_driver, "glui") + || string_is_equal(settings->arrays.menu_driver, "xmb") + || string_is_equal(settings->arrays.menu_driver, "ozone")) { CONFIG_FLOAT( list, list_info, @@ -19060,7 +19081,8 @@ static bool setting_append_list( #endif #if defined(HAVE_XMB) || defined(HAVE_OZONE) - if (string_is_equal(settings->arrays.menu_driver, "xmb") || string_is_equal(settings->arrays.menu_driver, "ozone")) + if ( string_is_equal(settings->arrays.menu_driver, "xmb") + || string_is_equal(settings->arrays.menu_driver, "ozone")) { CONFIG_BOOL( list, list_info, @@ -19626,10 +19648,10 @@ static bool setting_append_list( SD_FLAG_NONE); } - if (string_is_equal(settings->arrays.menu_driver, "xmb") || - string_is_equal(settings->arrays.menu_driver, "ozone") || - string_is_equal(settings->arrays.menu_driver, "rgui") || - string_is_equal(settings->arrays.menu_driver, "glui")) + if ( string_is_equal(settings->arrays.menu_driver, "xmb") + || string_is_equal(settings->arrays.menu_driver, "ozone") + || string_is_equal(settings->arrays.menu_driver, "rgui") + || string_is_equal(settings->arrays.menu_driver, "glui")) { enum msg_hash_enums thumbnails_label_value; enum msg_hash_enums left_thumbnails_label_value; @@ -19740,9 +19762,9 @@ static bool setting_append_list( menu_settings_list_current_add_range(list, list_info, (*list)[list_info->index - 1].offset_by, 100, 1, true, true); } - if (string_is_equal(settings->arrays.menu_driver, "xmb") || - string_is_equal(settings->arrays.menu_driver, "ozone") || - string_is_equal(settings->arrays.menu_driver, "glui")) + if ( string_is_equal(settings->arrays.menu_driver, "xmb") + || string_is_equal(settings->arrays.menu_driver, "ozone") + || string_is_equal(settings->arrays.menu_driver, "glui")) { CONFIG_UINT( list, list_info, @@ -21535,8 +21557,8 @@ static bool setting_append_list( /* Playlist entry index display and content specific history icon * are currently supported only by Ozone & XMB */ - if (string_is_equal(settings->arrays.menu_driver, "xmb") || - string_is_equal(settings->arrays.menu_driver, "ozone")) + if ( string_is_equal(settings->arrays.menu_driver, "xmb") + || string_is_equal(settings->arrays.menu_driver, "ozone")) { CONFIG_UINT( list, list_info, @@ -21684,8 +21706,8 @@ static bool setting_append_list( ); #if defined(HAVE_OZONE) || defined(HAVE_XMB) - if (string_is_equal(settings->arrays.menu_driver, "ozone") || - string_is_equal(settings->arrays.menu_driver, "xmb")) + if ( string_is_equal(settings->arrays.menu_driver, "ozone") + || string_is_equal(settings->arrays.menu_driver, "xmb")) { CONFIG_BOOL( list, list_info, @@ -21786,7 +21808,8 @@ static bool setting_append_list( ); #ifndef HAVE_GFX_WIDGETS - if (string_is_equal(settings->arrays.menu_driver, "xmb") || string_is_equal(settings->arrays.menu_driver, "ozone")) + if ( string_is_equal(settings->arrays.menu_driver, "xmb") + || string_is_equal(settings->arrays.menu_driver, "ozone")) CONFIG_BOOL( list, list_info, &settings->bools.cheevos_badges_enable, diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c index da253abc01..01fb36fdf0 100644 --- a/tasks/task_autodetect.c +++ b/tasks/task_autodetect.c @@ -511,7 +511,7 @@ static void reallocate_port_if_needed(unsigned detected_port, int vendor_id, if (device_has_reserved_slot) { unsigned prev_assigned_port = settings->uints.input_joypad_index[player]; - if(detected_port != prev_assigned_port) + if (detected_port != prev_assigned_port) { RARCH_LOG("[Autoconf]: Device \"%s\" (%x:%x) is reserved " "for player %d, updating.\n", diff --git a/tasks/task_movie.c b/tasks/task_movie.c index a6a0242c71..901f3a7968 100644 --- a/tasks/task_movie.c +++ b/tasks/task_movie.c @@ -411,7 +411,7 @@ bool movie_stop(input_driver_state_t *input_st) return movie_stop_playback(input_st); else if (input_st->bsv_movie_state.flags & BSV_FLAG_MOVIE_RECORDING) return movie_stop_record(input_st); - if(input_st->bsv_movie_state_handle) + if (input_st->bsv_movie_state_handle) RARCH_ERR("Didn't really stop movie!\n"); return true; } diff --git a/tasks/task_save.c b/tasks/task_save.c index 1c04ac377c..f41a492ee5 100644 --- a/tasks/task_save.c +++ b/tasks/task_save.c @@ -354,10 +354,10 @@ static size_t content_get_rastate_size(rastate_size_info_t* size, bool rewind) #endif #ifdef HAVE_BSV_MOVIE /* 8-byte block header + content */ - if(!rewind) + if (!rewind) { size->replay_size = replay_get_serialize_size(); - if(size->replay_size > 0) + if (size->replay_size > 0) size->total_size += 8 + CONTENT_ALIGN_SIZE(size->replay_size); } else