Permalink
Browse files

GSdx OSD: Minor log improvements

  • Loading branch information...
1 parent 83b5bdb commit d42759c6417f6df0b8d5802b7a02f251617c2640 @FlatOutPS2 FlatOutPS2 committed with turtleli Jan 3, 2017
Showing with 17 additions and 13 deletions.
  1. +1 −1 pcsx2/PluginManager.cpp
  2. +11 −7 pcsx2/gui/FrameForGS.cpp
  3. +4 −4 pcsx2/gui/GlobalCommands.cpp
  4. +1 −1 pcsx2/gui/SysState.cpp
@@ -426,7 +426,7 @@ static const LegacyApi_ReqMethod s_MethMessReq_GS[] =
static const LegacyApi_OptMethod s_MethMessOpt_GS[] =
{
{ "GSosdLog", (vMeth**)&GSosdLog },
- { "GSosdMonitor", (vMeth**)&GSosdMonitor },
+ { "GSosdMonitor", (vMeth**)&GSosdMonitor },
{ "GSopen2", (vMeth**)&GSopen2 },
{ "GSreset", (vMeth**)&GSreset },
{ "GSsetupRecording", (vMeth**)&GSsetupRecording },
@@ -587,14 +587,24 @@ GSPanel* GSFrame::GetViewport()
void GSFrame::OnUpdateTitle( wxTimerEvent& evt )
{
+ double fps = wxGetApp().FpsManager.GetFramerate();
+
+ OSDmonitor(Color_StrongGreen, "EE:", std::to_string(m_CpuUsage.GetEEcorePct()).c_str());
+ OSDmonitor(Color_StrongGreen, "GS:", std::to_string(m_CpuUsage.GetGsPct()).c_str());
+ OSDmonitor(Color_StrongGreen, "UI:", std::to_string(m_CpuUsage.GetGuiPct()).c_str());
+
+ std::ostringstream out;
+ out << std::fixed << std::setprecision(2) << fps;
+ OSDmonitor(Color_StrongGreen, "FPS:", out.str());
+
#ifdef __linux__
// Important Linux note: When the title is set in fullscreen the window is redrawn. Unfortunately
// an intermediate white screen appears too which leads to a very annoying flickering.
if (IsFullScreen()) return;
#endif
+
AppConfig::UiTemplateOptions& templates = g_Conf->Templates;
- double fps = wxGetApp().FpsManager.GetFramerate();
float percentage = (fps * 100) / GetVerticalFrequency().ToFloat();
char gsDest[128];
@@ -618,15 +628,12 @@ void GSFrame::OnUpdateTitle( wxTimerEvent& evt )
m_CpuUsage.UpdateStats();
cpuUsage.Write(L"EE: %3d%%", m_CpuUsage.GetEEcorePct());
- OSDmonitor(Color_StrongRed, "EE", std::to_string(m_CpuUsage.GetEEcorePct()).c_str());
cpuUsage.Write(L" | GS: %3d%%", m_CpuUsage.GetGsPct());
- OSDmonitor(Color_StrongGreen, "GS", std::to_string(m_CpuUsage.GetGsPct()).c_str());
if (THREAD_VU1)
cpuUsage.Write(L" | VU: %3d%%", m_CpuUsage.GetVUPct());
pxNonReleaseCode(cpuUsage.Write(L" | UI: %3d%%", m_CpuUsage.GetGuiPct()));
- OSDmonitor(Color_StrongYellow, "UI", std::to_string(m_CpuUsage.GetGuiPct()).c_str());
}
const u64& smode2 = *(u64*)PS2GS_BASE(GS_SMODE2);
@@ -638,9 +645,6 @@ void GSFrame::OnUpdateTitle( wxTimerEvent& evt )
title.Replace(L"${limiter}", limiterStr);
title.Replace(L"${speed}", pxsFmt(L"%3d%%", lround(percentage)));
title.Replace(L"${vfps}", pxsFmt(L"%.02f", fps));
- std::ostringstream out;
- out << std::fixed << std::setprecision(2) << fps;
- OSDmonitor(Color_StrongBlue, "FPS", out.str());
title.Replace(L"${cpuusage}", cpuUsage);
title.Replace(L"${omodef}", omodef);
title.Replace(L"${omodei}", omodei);
@@ -180,13 +180,13 @@ namespace Implementations
art = AspectRatio_4_3;
switch( art )
{
- case AspectRatio_Stretch: art = AspectRatio_4_3; arts = "AspectRatio_4_3"; break;
- case AspectRatio_4_3: art = AspectRatio_16_9; arts = "AspectRatio_16:9"; break;
- case AspectRatio_16_9: art = AspectRatio_Stretch; arts = "AspectRatio_Stretch";break;
+ case AspectRatio_Stretch: art = AspectRatio_4_3; arts = "4:3"; break;
+ case AspectRatio_4_3: art = AspectRatio_16_9; arts = "16:9"; break;
+ case AspectRatio_16_9: art = AspectRatio_Stretch; arts = "Stretch"; break;
default: break;
}
- OSDlog( Color_StrongBlue, true, "(GSwindow) Aspect ratio: %s.", arts );
+ OSDlog(Color_StrongBlue, true, "(GSwindow) Aspect ratio: %s", arts);
UpdateImagePosition();
}
@@ -686,7 +686,7 @@ void StateCopy_LoadFromSlot( uint slot, bool isFromBackup )
if( !wxFileExists( file ) )
{
- Console.Warning( L"Savestate slot %d%s is empty.", slot, isFromBackup?L" (backup)":L"" );
+ OSDlog(Color_StrongGreen, true, "Savestate slot %d%s is empty.", slot, isFromBackup ? " (backup)" : "");
return;
}

0 comments on commit d42759c

Please sign in to comment.