piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Renamed EuRGB60 to PAL60

Browse Source
This commit is contained in:
Stevoisiak
2014-10-13 18:24:35 -04:00
committed by Steven Vascellaro
parent f7d1943615
commit e7a82c4ded
13 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HW/VideoInterface.h
View File

@ -21,7 +21,7 @@ namespace VideoInterface
#define NTSC_LINE_COUNT 525
// These line numbers indicate the beginning of the "active video" in a frame.
// An NTSC frame has the lower field first followed by the upper field.
// TODO: Is this true for PAL-M? Is this true for EURGB60?
// TODO: Is this true for PAL-M? Is this true for PAL60?
#define NTSC_LOWER_BEGIN 21
#define NTSC_UPPER_BEGIN 283

10
Source/Core/DolphinWX/ConfigMain.cpp
View File

@ -250,7 +250,7 @@ void CConfigMain::UpdateGUI()
// Disable stuff on WiiPage
WiiScreenSaver->Disable();
WiiEuRGB60->Disable();
WiiPAL60->Disable();
WiiAspectRatio->Disable();
WiiSystemLang->Disable();
@ -490,7 +490,7 @@ void CConfigMain::InitializeGUIValues()
// Wii - Misc
WiiScreenSaver->SetValue(!!SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.SSV"));
WiiEuRGB60->SetValue(!!SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.E60"));
WiiPAL60->SetValue(!!SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.E60"));
WiiAspectRatio->SetSelection(SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.AR"));
WiiSystemLang->SetSelection(SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG"));
@ -782,7 +782,7 @@ void CConfigMain::CreateGUIControls()
// Wii page
// Misc Settings
WiiScreenSaver = new wxCheckBox(WiiPage, ID_WII_IPL_SSV, _("Enable Screen Saver"));
WiiEuRGB60 = new wxCheckBox(WiiPage, ID_WII_IPL_E60, _("Use EuRGB60 Mode (PAL60)"));
WiiPAL60 = new wxCheckBox(WiiPage, ID_WII_IPL_E60, _("Use PAL60 Mode (EuRGB60)"));
WiiAspectRatio = new wxChoice(WiiPage, ID_WII_IPL_AR, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiAspectRatio);
WiiSystemLang = new wxChoice(WiiPage, ID_WII_IPL_LNG, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiSystemLang);
@ -793,7 +793,7 @@ void CConfigMain::CreateGUIControls()
// Populate the Wii Page
sWiiIPLSettings = new wxGridBagSizer();
sWiiIPLSettings->Add(WiiScreenSaver, wxGBPosition(0, 0), wxGBSpan(1, 2), wxALL, 5);
sWiiIPLSettings->Add(WiiEuRGB60, wxGBPosition(1, 0), wxGBSpan(1, 2), wxALL, 5);
sWiiIPLSettings->Add(WiiPAL60, wxGBPosition(1, 0), wxGBSpan(1, 2), wxALL, 5);
sWiiIPLSettings->Add(TEXT_BOX(WiiPage, _("Aspect Ratio:")),
wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5);
sWiiIPLSettings->Add(WiiAspectRatio, wxGBPosition(2, 1), wxDefaultSpan, wxALL, 5);
@ -1203,7 +1203,7 @@ void CConfigMain::WiiSettingsChanged(wxCommandEvent& event)
SConfig::GetInstance().m_SYSCONF->SetData("IPL.SSV", WiiScreenSaver->IsChecked());
break;
case ID_WII_IPL_E60:
SConfig::GetInstance().m_SYSCONF->SetData("IPL.E60", WiiEuRGB60->IsChecked());
SConfig::GetInstance().m_SYSCONF->SetData("IPL.E60", WiiPAL60->IsChecked());
break;
case ID_WII_IPL_AR:
SConfig::GetInstance().m_SYSCONF->SetData("IPL.AR", WiiAspectRatio->GetSelection());

2
Source/Core/DolphinWX/ConfigMain.h
View File

@ -195,7 +195,7 @@ private:
// Misc
wxCheckBox* WiiScreenSaver;
wxCheckBox* WiiEuRGB60;
wxCheckBox* WiiPAL60;
wxChoice* WiiAspectRatio;
wxChoice* WiiSystemLang;

2
Source/Core/VideoCommon/AVIDump.cpp
View File

@ -28,7 +28,7 @@
#include <vfw.h>
#include <winerror.h>
#include "Core/ConfigManager.h" // for EuRGB60
#include "Core/ConfigManager.h" // for PAL60
#include "Core/CoreTiming.h"
static HWND s_emu_wnd;