diff --git a/pcsx2/gui/AppConfig.cpp b/pcsx2/gui/AppConfig.cpp index 6b0c20fa81..bbd8ec6ee8 100644 --- a/pcsx2/gui/AppConfig.cpp +++ b/pcsx2/gui/AppConfig.cpp @@ -931,15 +931,15 @@ void AppConfig::FramerateOptions::LoadSave( IniInterface& ini ) AppConfig::UiTemplateOptions::UiTemplateOptions() { - LimiterUnlimited = L"-unlimited"; - LimiterTurbo = L"-turbo"; - LimiterSlowmo = L"-slowmo"; - LimiterNormal = L""; - OutputFrame = L"frame"; - OutputField = L"field"; - OutputProgressive = L"p"; - OutputInterlaced = L"i"; - TitleTemplate = L"Slot: ${slot} | Speed${limiter}: ${speed} (${vfps}) | ${cpuusage} | ${omodef}-${omodei} | ${gsdx}"; + LimiterUnlimited = L"Max"; + LimiterTurbo = L"Turbo"; + LimiterSlowmo = L"Slowmo"; + LimiterNormal = L"Normal"; + OutputFrame = L"Frame"; + OutputField = L"Field"; + OutputProgressive = L"Progressive"; + OutputInterlaced = L"Interlaced"; + TitleTemplate = L"Slot: ${slot} | Speed: ${speed} (${vfps}) | Limiter: ${limiter} | ${gsdx} | ${omodec} | ${cpuusage}"; } void AppConfig::UiTemplateOptions::LoadSave(IniInterface& ini) diff --git a/pcsx2/gui/FrameForGS.cpp b/pcsx2/gui/FrameForGS.cpp index 8e52c0aa10..94b7937667 100644 --- a/pcsx2/gui/FrameForGS.cpp +++ b/pcsx2/gui/FrameForGS.cpp @@ -587,12 +587,14 @@ void GSFrame::OnUpdateTitle( wxTimerEvent& evt ) if (THREAD_VU1) cpuUsage.Write(L" | VU: %3d%%", m_CpuUsage.GetVUPct()); - pxNonReleaseCode(cpuUsage.Write(L" | UI: %3d%%", m_CpuUsage.GetEEcorePct());) + pxNonReleaseCode(cpuUsage.Write(L" | UI: %3d%%", m_CpuUsage.GetGuiPct());) } const u64& smode2 = *(u64*)PS2GS_BASE(GS_SMODE2); wxString omodef = (smode2 & 2) ? templates.OutputFrame : templates.OutputField; wxString omodei = (smode2 & 1) ? templates.OutputInterlaced : templates.OutputProgressive; + //This is a lie, but Field mode is essentially not interlaced, will probably be 1/2 FPS + wxString omodec = ((smode2 & 3) == 1) ? templates.OutputProgressive : omodei; wxString title = templates.TitleTemplate; title.Replace(L"${slot}", pxsFmt(L"%d", States_GetCurrentSlot())); @@ -602,6 +604,7 @@ void GSFrame::OnUpdateTitle( wxTimerEvent& evt ) title.Replace(L"${cpuusage}", cpuUsage); title.Replace(L"${omodef}", omodef); title.Replace(L"${omodei}", omodei); + title.Replace(L"${omodec}", omodec); title.Replace(L"${gsdx}", fromUTF8(gsDest)); SetTitle(title);