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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-02-18 15:30:47 +01:00
parent 3a94c52426
commit 7f2d8742c2
2 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
menu/menu_setting.c
View File

@ -4286,17 +4286,18 @@ static void setting_get_string_representation_uint_custom_viewport_width(rarch_s
{ {
struct retro_game_geometry *geom = NULL; struct retro_game_geometry *geom = NULL;
struct retro_system_av_info *av_info = NULL; struct retro_system_av_info *av_info = NULL;
unsigned int rotation = retroarch_get_rotation();
if (!setting) if (!setting)
return; return;
av_info = video_viewport_get_system_av_info(); av_info = video_viewport_get_system_av_info();
geom = (struct retro_game_geometry*)&av_info->geometry; geom = (struct retro_game_geometry*)&av_info->geometry;
if (!(retroarch_get_rotation() % 2) && (*setting->value.target.unsigned_integer%geom->base_width == 0)) if (!(rotation % 2) && (*setting->value.target.unsigned_integer%geom->base_width == 0))
snprintf(s, len, "%u (%ux)", snprintf(s, len, "%u (%ux)",
*setting->value.target.unsigned_integer, *setting->value.target.unsigned_integer,
*setting->value.target.unsigned_integer / geom->base_width); *setting->value.target.unsigned_integer / geom->base_width);
else if ((retroarch_get_rotation() % 2) && (*setting->value.target.unsigned_integer%geom->base_height == 0)) else if ((rotation % 2) && (*setting->value.target.unsigned_integer%geom->base_height == 0))
snprintf(s, len, "%u (%ux)", snprintf(s, len, "%u (%ux)",
*setting->value.target.unsigned_integer, *setting->value.target.unsigned_integer,
*setting->value.target.unsigned_integer / geom->base_height); *setting->value.target.unsigned_integer / geom->base_height);
@ -4310,17 +4311,18 @@ static void setting_get_string_representation_uint_custom_viewport_height(rarch_
{ {
struct retro_game_geometry *geom = NULL; struct retro_game_geometry *geom = NULL;
struct retro_system_av_info *av_info = NULL; struct retro_system_av_info *av_info = NULL;
unsigned int rotation = retroarch_get_rotation();
if (!setting) if (!setting)
return; return;
av_info = video_viewport_get_system_av_info(); av_info = video_viewport_get_system_av_info();
geom = (struct retro_game_geometry*)&av_info->geometry; geom = (struct retro_game_geometry*)&av_info->geometry;
if (!(retroarch_get_rotation() % 2) && (*setting->value.target.unsigned_integer%geom->base_height == 0)) if (!(rotation % 2) && (*setting->value.target.unsigned_integer%geom->base_height == 0))
snprintf(s, len, "%u (%ux)", snprintf(s, len, "%u (%ux)",
*setting->value.target.unsigned_integer, *setting->value.target.unsigned_integer,
*setting->value.target.unsigned_integer / geom->base_height); *setting->value.target.unsigned_integer / geom->base_height);
else if ((retroarch_get_rotation() % 2) && (*setting->value.target.unsigned_integer%geom->base_width == 0)) else if ((rotation % 2) && (*setting->value.target.unsigned_integer%geom->base_width == 0))
snprintf(s, len, "%u (%ux)", snprintf(s, len, "%u (%ux)",
*setting->value.target.unsigned_integer, *setting->value.target.unsigned_integer,
*setting->value.target.unsigned_integer / geom->base_width); *setting->value.target.unsigned_integer / geom->base_width);
@ -4729,7 +4731,8 @@ static int setting_uint_action_left_custom_viewport_width(
custom->width = 1; custom->width = 1;
else if (settings->bools.video_scale_integer) else if (settings->bools.video_scale_integer)
{ {
if (retroarch_get_rotation() % 2) unsigned int rotation = retroarch_get_rotation();
if (rotation % 2)
{ {
if (custom->width > geom->base_height) if (custom->width > geom->base_height)
custom->width -= geom->base_height; custom->width -= geom->base_height;
@ -4768,7 +4771,8 @@ static int setting_uint_action_left_custom_viewport_height(
custom->height = 1; custom->height = 1;
else if (settings->bools.video_scale_integer) else if (settings->bools.video_scale_integer)
{ {
if (retroarch_get_rotation() % 2) unsigned int rotation = retroarch_get_rotation();
if (rotation % 2)
{ {
if (custom->height > geom->base_width) if (custom->height > geom->base_width)
custom->height -= geom->base_width; custom->height -= geom->base_width;
@ -4976,7 +4980,8 @@ static int setting_uint_action_right_custom_viewport_width(
if (settings->bools.video_scale_integer) if (settings->bools.video_scale_integer)
{ {
if (retroarch_get_rotation() % 2) unsigned int rotation = retroarch_get_rotation();
if (rotation % 2)
custom->width += geom->base_height; custom->width += geom->base_height;
else else
custom->width += geom->base_width; custom->width += geom->base_width;
@ -5007,7 +5012,8 @@ static int setting_uint_action_right_custom_viewport_height(
if (settings->bools.video_scale_integer) if (settings->bools.video_scale_integer)
{ {
if (retroarch_get_rotation() % 2) unsigned int rotation = retroarch_get_rotation();
if (rotation % 2)
custom->height += geom->base_width; custom->height += geom->base_width;
else else
custom->height += geom->base_height; custom->height += geom->base_height;
@ -6002,11 +6008,10 @@ static int setting_action_start_custom_viewport_width(rarch_setting_t *setting)
if (settings->bools.video_scale_integer) if (settings->bools.video_scale_integer)
{ {
if (retroarch_get_rotation() % 2) unsigned int rotation = retroarch_get_rotation();
{ if (rotation % 2)
custom->width = ((custom->width + geom->base_height - 1) / custom->width = ((custom->width + geom->base_height - 1) /
geom->base_height) * geom->base_height; geom->base_height) * geom->base_height;
}
else else
custom->width = ((custom->width + geom->base_width - 1) / custom->width = ((custom->width + geom->base_width - 1) /
geom->base_width) * geom->base_width; geom->base_width) * geom->base_width;
@ -6036,14 +6041,15 @@ static int setting_action_start_custom_viewport_height(rarch_setting_t *setting)
if (settings->bools.video_scale_integer) if (settings->bools.video_scale_integer)
{ {
if (retroarch_get_rotation() % 2) unsigned int rotation = retroarch_get_rotation();
{ if (rotation % 2)
custom->height = ((custom->height + geom->base_width - 1) / {
custom->height = ((custom->height + geom->base_width - 1) /
geom->base_width) * geom->base_width; geom->base_width) * geom->base_width;
} }
else else
custom->height = ((custom->height + geom->base_height - 1) / custom->height = ((custom->height + geom->base_height - 1) /
geom->base_height) * geom->base_height; geom->base_height) * geom->base_height;
} }
else else
custom->height = vp.full_height - custom->y; custom->height = vp.full_height - custom->y;
@ -6423,9 +6429,12 @@ void general_write_handler(rarch_setting_t *setting)
if (*setting->value.target.boolean) if (*setting->value.target.boolean)
{ {
custom->x = 0; unsigned int rotation = retroarch_get_rotation();
custom->y = 0;
if (retroarch_get_rotation() %2) custom->x = 0;
custom->y = 0;
if (rotation % 2)
{ {
custom->width = ((custom->width + geom->base_height - 1) / geom->base_height) * geom->base_height; custom->width = ((custom->width + geom->base_height - 1) / geom->base_height) * geom->base_height;
custom->height = ((custom->height + geom->base_width - 1) / geom->base_width) * geom->base_width; custom->height = ((custom->height + geom->base_width - 1) / geom->base_width) * geom->base_width;
@ -6566,7 +6575,10 @@ void general_write_handler(rarch_setting_t *setting)
struct retro_game_geometry *geom = (struct retro_game_geometry*) struct retro_game_geometry *geom = (struct retro_game_geometry*)
&av_info->geometry; &av_info->geometry;
if (system){ if (system)
{
unsigned int rotation = retroarch_get_rotation();
video_driver_set_rotation( video_driver_set_rotation(
(*setting->value.target.unsigned_integer + (*setting->value.target.unsigned_integer +
system->rotation) % 4); system->rotation) % 4);
@ -6577,7 +6589,7 @@ void general_write_handler(rarch_setting_t *setting)
custom->y = 0; custom->y = 0;
/* Round down when rotation is "horizontal", round up when rotation is "vertical" /* Round down when rotation is "horizontal", round up when rotation is "vertical"
to avoid expanding viewport each time user rotates */ to avoid expanding viewport each time user rotates */
if (retroarch_get_rotation() %2) if (rotation % 2)
{ {
custom->width = MAX(1,(custom->width / geom->base_height)) * geom->base_height; custom->width = MAX(1,(custom->width / geom->base_height)) * geom->base_height;
custom->height = MAX(1,(custom->height/ geom->base_width )) * geom->base_width; custom->height = MAX(1,(custom->height/ geom->base_width )) * geom->base_width;

13
retroarch.c
View File

@ -20590,6 +20590,7 @@ static void video_driver_set_viewport_square_pixel(void)
struct retro_game_geometry *geom = &video_driver_av_info.geometry; struct retro_game_geometry *geom = &video_driver_av_info.geometry;
unsigned width = geom->base_width; unsigned width = geom->base_width;
unsigned height = geom->base_height; unsigned height = geom->base_height;
unsigned int rotation = retroarch_get_rotation();
if (width == 0 || height == 0) if (width == 0 || height == 0)
return; return;
@ -20603,7 +20604,7 @@ static void video_driver_set_viewport_square_pixel(void)
highest = i; highest = i;
} }
if (retroarch_get_rotation() % 2) if (rotation % 2)
{ {
aspect_x = height / highest; aspect_x = height / highest;
aspect_y = width / highest; aspect_y = width / highest;
@ -21704,9 +21705,10 @@ void video_viewport_get_scaled_integer(struct video_viewport *vp,
unsigned base_width; unsigned base_width;
/* Use system reported sizes as these define the /* Use system reported sizes as these define the
* geometry for the "normal" case. */ * geometry for the "normal" case. */
unsigned base_height = video_driver_av_info.geometry.base_height; unsigned base_height = video_driver_av_info.geometry.base_height;
unsigned int rotation = retroarch_get_rotation();
if (retroarch_get_rotation() % 2) if (rotation % 2)
base_height = video_driver_av_info.geometry.base_width; base_height = video_driver_av_info.geometry.base_width;
if (base_height == 0) if (base_height == 0)
@ -28668,7 +28670,6 @@ unsigned int retroarch_get_rotation(void)
return settings->uints.video_rotation + runloop_system.rotation; return settings->uints.video_rotation + runloop_system.rotation;
} }
bool is_input_keyboard_display_on(void) bool is_input_keyboard_display_on(void)
{ {
#ifdef HAVE_MENU #ifdef HAVE_MENU
@ -28679,14 +28680,14 @@ bool is_input_keyboard_display_on(void)
} }
#ifdef HAVE_ACCESSIBILITY #ifdef HAVE_ACCESSIBILITY
bool accessibility_speak_priority(const char* speak_text, int priority) bool accessibility_speak_priority(const char* speak_text, int priority)
{ {
RARCH_LOG("Spoke: %s\n", speak_text); RARCH_LOG("Spoke: %s\n", speak_text);
if (is_accessibility_enabled()) if (is_accessibility_enabled())
{ {
int speed = configuration_settings->uints.accessibility_narrator_speech_speed; int speed =
configuration_settings->uints.accessibility_narrator_speech_speed;
frontend_ctx_driver_t *frontend = frontend_get_ptr(); frontend_ctx_driver_t *frontend = frontend_get_ptr();
if (frontend && frontend->accessibility_speak) if (frontend && frontend->accessibility_speak)
return frontend->accessibility_speak(speed, speak_text, return frontend->accessibility_speak(speed, speak_text,