ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GUI: Make aspect ratio/frame limiter OSD messages keyed 

Keyed messages don't pile up so spamming turbo/frame limiter
keys will not generate multiple messages now.
This commit is contained in:
Silent 2022-01-10 18:13:24 +01:00 committed by lightningterror
parent fa50e9dd20
commit f1d3177b69
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pcsx2/gui/GlobalCommands.cpp
View File

@ -16,6 +16,7 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "MainFrame.h" #include "MainFrame.h"
#include "GSFrame.h" #include "GSFrame.h"
#include "Host.h"
#include "ApplyState.h" #include "ApplyState.h"
#include "ConsoleLogger.h" #include "ConsoleLogger.h"
@ -73,12 +74,11 @@ namespace Implementations
if (EmuConfig.GS.FrameSkipEnable) if (EmuConfig.GS.FrameSkipEnable)
{ {
OSDlog(Color_StrongRed, true, "(FrameSkipping) Enabled."); Host::AddKeyedFormattedOSDMessage("FrameSkipping", 2.0f, "Frameskip ENABLED. FrameDraws=%d, FrameSkips=%d", g_Conf->EmuOptions.GS.FramesToDraw, g_Conf->EmuOptions.GS.FramesToSkip);
OSDlog(Color_StrongRed, true, " FrameDraws=%d, FrameSkips=%d", g_Conf->EmuOptions.GS.FramesToDraw, g_Conf->EmuOptions.GS.FramesToSkip);
} }
else else
{ {
OSDlog(Color_StrongRed, true, "(FrameSkipping) Disabled."); Host::AddKeyedOSDMessage("FrameSkipping", "Frameskip DISABLED.");
} }
} }
@ -90,7 +90,7 @@ namespace Implementations
{ {
g_Conf->EmuOptions.GS.FrameLimitEnable = true; g_Conf->EmuOptions.GS.FrameLimitEnable = true;
g_Conf->EmuOptions.LimiterMode = LimiterModeType::Turbo; g_Conf->EmuOptions.LimiterMode = LimiterModeType::Turbo;
OSDlog(Color_StrongRed, true, "(FrameLimiter) Turbo + FrameLimit ENABLED."); Host::AddKeyedOSDMessage("FrameLimiter", "Turbo + Frame limiter ENABLED.");
g_Conf->EmuOptions.GS.FrameSkipEnable = !!EmuConfig.Framerate.SkipOnTurbo; g_Conf->EmuOptions.GS.FrameSkipEnable = !!EmuConfig.Framerate.SkipOnTurbo;
} }
else if (g_Conf->EmuOptions.LimiterMode == LimiterModeType::Turbo) else if (g_Conf->EmuOptions.LimiterMode == LimiterModeType::Turbo)
@ -99,12 +99,13 @@ namespace Implementations
if (g_Conf->EmuOptions.Framerate.SkipOnLimit) if (g_Conf->EmuOptions.Framerate.SkipOnLimit)
{ {
OSDlog(Color_StrongRed, true, "(FrameLimiter) Turbo DISABLED. Frameskip ENABLED"); Host::AddKeyedOSDMessage("FrameLimiter", "Turbo DISABLED.");
Host::AddKeyedOSDMessage("FrameSkipping", "Frameskip ENABLED.");
g_Conf->EmuOptions.GS.FrameSkipEnable = true; g_Conf->EmuOptions.GS.FrameSkipEnable = true;
} }
else else
{ {
OSDlog(Color_StrongRed, true, "(FrameLimiter) Turbo DISABLED."); Host::AddKeyedOSDMessage("FrameLimiter", "Turbo DISABLED.");
g_Conf->EmuOptions.GS.FrameSkipEnable = false; g_Conf->EmuOptions.GS.FrameSkipEnable = false;
} }
} }
@ -114,12 +115,13 @@ namespace Implementations
if (g_Conf->EmuOptions.Framerate.SkipOnTurbo) if (g_Conf->EmuOptions.Framerate.SkipOnTurbo)
{ {
OSDlog(Color_StrongRed, true, "(FrameLimiter) Turbo + Frameskip ENABLED."); Host::AddKeyedOSDMessage("FrameLimiter", "Turbo ENABLED.");
Host::AddKeyedOSDMessage("FrameSkipping", "Frameskip ENABLED.");
g_Conf->EmuOptions.GS.FrameSkipEnable = true; g_Conf->EmuOptions.GS.FrameSkipEnable = true;
} }
else else
{ {
OSDlog(Color_StrongRed, true, "(FrameLimiter) Turbo ENABLED."); Host::AddKeyedOSDMessage("FrameLimiter", "Turbo ENABLED.");
g_Conf->EmuOptions.GS.FrameSkipEnable = false; g_Conf->EmuOptions.GS.FrameSkipEnable = false;
} }
} }
@ -139,12 +141,12 @@ namespace Implementations
if (g_Conf->EmuOptions.LimiterMode == LimiterModeType::Slomo) if (g_Conf->EmuOptions.LimiterMode == LimiterModeType::Slomo)
{ {
g_Conf->EmuOptions.LimiterMode = LimiterModeType::Nominal; g_Conf->EmuOptions.LimiterMode = LimiterModeType::Nominal;
OSDlog(Color_StrongRed, true, "(FrameLimiter) SlowMotion DISABLED."); Host::AddKeyedOSDMessage("FrameLimiter", "Slow motion DISABLED.");
} }
else else
{ {
g_Conf->EmuOptions.LimiterMode = LimiterModeType::Slomo; g_Conf->EmuOptions.LimiterMode = LimiterModeType::Slomo;
OSDlog(Color_StrongRed, true, "(FrameLimiter) SlowMotion ENABLED."); Host::AddKeyedOSDMessage("FrameLimiter", "Slow motion ENABLED.");
g_Conf->EmuOptions.GS.FrameLimitEnable = true; g_Conf->EmuOptions.GS.FrameLimitEnable = true;
} }
@ -155,7 +157,7 @@ namespace Implementations
{ {
ScopedCoreThreadPause pauser; ScopedCoreThreadPause pauser;
g_Conf->EmuOptions.GS.FrameLimitEnable = !g_Conf->EmuOptions.GS.FrameLimitEnable; g_Conf->EmuOptions.GS.FrameLimitEnable = !g_Conf->EmuOptions.GS.FrameLimitEnable;
OSDlog(Color_StrongRed, true, "(FrameLimiter) %s.", g_Conf->EmuOptions.GS.FrameLimitEnable ? "ENABLED" : "DISABLED"); Host::AddKeyedFormattedOSDMessage("FrameLimiter", 2.0f, "Frame limiter %s.", g_Conf->EmuOptions.GS.FrameLimitEnable ? "ENABLED" : "DISABLED");
// Turbo/Slowmo don't make sense when framelimiter is toggled // Turbo/Slowmo don't make sense when framelimiter is toggled
g_Conf->EmuOptions.LimiterMode = LimiterModeType::Nominal; g_Conf->EmuOptions.LimiterMode = LimiterModeType::Nominal;
@ -192,7 +194,7 @@ namespace Implementations
// Prevent GS reopening for the setting change. // Prevent GS reopening for the setting change.
EmuConfig.GS.AspectRatio = art; EmuConfig.GS.AspectRatio = art;
OSDlog(Color_StrongBlue, true, "(GSwindow) Aspect ratio: %s", arts); Host::AddKeyedFormattedOSDMessage("AspectRatio", 2.0f, "Aspect ratio: %s", arts);
} }
// NOTE: The settings below are super janky and race the GS thread when updating. // NOTE: The settings below are super janky and race the GS thread when updating.
@ -205,7 +207,7 @@ namespace Implementations
EmuConfig.GS.OffsetY = y; EmuConfig.GS.OffsetY = y;
GSConfig.OffsetX = x; GSConfig.OffsetX = x;
GSConfig.OffsetY = y; GSConfig.OffsetY = y;
OSDlog(Color_StrongBlue, true, "(GSwindow) Offset: x=%f, y=%f", x, y); Host::AddKeyedFormattedOSDMessage("WindowOffset", 2.0f, "Offset: x=%f, y=%f", x, y);
} }
void GSwindow_OffsetYplus() void GSwindow_OffsetYplus()
@ -240,7 +242,7 @@ namespace Implementations
g_Conf->EmuOptions.GS.StretchY = zoom; g_Conf->EmuOptions.GS.StretchY = zoom;
EmuConfig.GS.StretchY = zoom; EmuConfig.GS.StretchY = zoom;
GSConfig.StretchY = zoom; GSConfig.StretchY = zoom;
OSDlog(Color_StrongBlue, true, "(GSwindow) Vertical stretch: %f", zoom); Host::AddKeyedFormattedOSDMessage("WindowVStretch", 2.0f, "Vertical stretch: %f", zoom);
} }
void GSwindow_ZoomInY() void GSwindow_ZoomInY()
@ -265,9 +267,9 @@ namespace Implementations
GSConfig.Zoom = zoom; GSConfig.Zoom = zoom;
if (zoom == 0) if (zoom == 0)
OSDlog(Color_StrongBlue, true, "(GSwindow) Zoom: 0 (auto, no black bars)"); Host::AddKeyedOSDMessage("WindowZoom", "Zoom: 0 (auto, no black bars)");
else else
OSDlog(Color_StrongBlue, true, "(GSwindow) Zoom: %f", zoom); Host::AddKeyedFormattedOSDMessage("WindowZoom", 2.0f, "Zoom: %f", zoom);
} }