X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmenu.c;h=83ad1c4a592e20399918ee1d60d88835014d2ad9;hb=8cd23d6dc354bd82c9ba3fa6362c8e9fb0b50f7d;hp=de13ad9e235e25d4acf2f6721876d3cd4ca544cb;hpb=2573466affd06edebd68070bf167a62ca764f2b4;p=pcsx_rearmed.git diff --git a/frontend/menu.c b/frontend/menu.c index de13ad9e..83ad1c4a 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -81,8 +81,13 @@ static int psx_clock; static int memcard1_sel, memcard2_sel; int g_opts, analog_deadzone; +#ifdef __ARM_ARCH_7A__ +#define DEFAULT_PSX_CLOCK 57 +#define DEFAULT_PSX_CLOCK_S "57" +#else #define DEFAULT_PSX_CLOCK 50 #define DEFAULT_PSX_CLOCK_S "50" +#endif // sound plugin extern int iUseReverb; @@ -2004,16 +2009,10 @@ void menu_notify_mode_change(int w, int h, int bpp) g_layer_w = w; g_layer_h = h; break; - case SCALE_4_3: - mult = 240.0f / (float)h * 4.0f / 3.0f; - if (h > 256) - mult *= 2.0f; - g_layer_w = mult * (float)g_menuscreen_h; - g_layer_h = g_menuscreen_h; - printf(" -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult); - break; - case SCALE_4_3v2: + if (h > g_menuscreen_h || (240 < h && h <= 360)) + goto fractional_4_3; + // 4:3 that prefers integer scaling imult = g_menuscreen_h / h; g_layer_w = w * imult; @@ -2024,6 +2023,16 @@ void menu_notify_mode_change(int w, int h, int bpp) printf(" -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult); break; + fractional_4_3: + case SCALE_4_3: + mult = 240.0f / (float)h * 4.0f / 3.0f; + if (h > 256) + mult *= 2.0f; + g_layer_w = mult * (float)g_menuscreen_h; + g_layer_h = g_menuscreen_h; + printf(" -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult); + break; + case SCALE_FULLSCREEN: g_layer_w = g_menuscreen_w; g_layer_h = g_menuscreen_h;