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

GSFrame: Fix up video mode detection. 

Previously Interlaced (Field) was displayed as Progressive which was wrong since the tested games didn't even support Progressive mode and it misleaded most of the users so let's just display Interlaced during Field mode.
This commit is contained in:
Akash 2015-12-17 19:24:48 +05:30
parent 601d18272b
commit 0f1fec40cf
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/gui/AppConfig.cpp
View File

@ -939,7 +939,7 @@ AppConfig::UiTemplateOptions::UiTemplateOptions()
OutputField = L"Field";
OutputProgressive = L"Progressive";
OutputInterlaced = L"Interlaced";
TitleTemplate = L"Slot: ${slot} | Speed: ${speed} (${vfps}) | Limiter: ${limiter} | ${gsdx} | ${omodec} | ${cpuusage}";
TitleTemplate = L"Slot: ${slot} | Speed: ${speed} (${vfps}) | Limiter: ${limiter} | ${gsdx} | ${omodei} | ${cpuusage}";
}
void AppConfig::UiTemplateOptions::LoadSave(IniInterface& ini)

5
pcsx2/gui/FrameForGS.cpp
View File

@ -587,14 +587,12 @@ void GSFrame::OnUpdateTitle( wxTimerEvent& evt )
if (THREAD_VU1)
cpuUsage.Write(L" | VU: %3d%%", m_CpuUsage.GetVUPct());
pxNonReleaseCode(cpuUsage.Write(L" | UI: %3d%%", m_CpuUsage.GetGuiPct());)
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()));
@ -604,7 +602,6 @@ 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);