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

Chance m_InterfaceFramelimit to m_Framelimit 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3490 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
death2droid 2009-06-18 11:23:37 +00:00
parent fc617299a7
commit 5d590d5934
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Src/ConfigManager.cpp
View File

@ -120,7 +120,7 @@ void SConfig::SaveSettings()
ini.Set("Core", "RunCompareServer", m_LocalCoreStartupParameter.bRunCompareServer); ini.Set("Core", "RunCompareServer", m_LocalCoreStartupParameter.bRunCompareServer);
ini.Set("Core", "RunCompareClient", m_LocalCoreStartupParameter.bRunCompareClient); ini.Set("Core", "RunCompareClient", m_LocalCoreStartupParameter.bRunCompareClient);
ini.Set("Core", "FrameLimit", m_InterfaceFramelimit); ini.Set("Core", "FrameLimit", m_Framelimit);
// Wii // Wii
ini.Set("Wii", "Widescreen", m_LocalCoreStartupParameter.bWidescreen); ini.Set("Wii", "Widescreen", m_LocalCoreStartupParameter.bWidescreen);
@ -237,7 +237,7 @@ void SConfig::LoadSettings()
ini.Get("Core", "RunCompareServer", &m_LocalCoreStartupParameter.bRunCompareServer, false); ini.Get("Core", "RunCompareServer", &m_LocalCoreStartupParameter.bRunCompareServer, false);
ini.Get("Core", "RunCompareClient", &m_LocalCoreStartupParameter.bRunCompareClient, false); ini.Get("Core", "RunCompareClient", &m_LocalCoreStartupParameter.bRunCompareClient, false);
ini.Get("Core", "TLBHack", &m_LocalCoreStartupParameter.iTLBHack, 0); ini.Get("Core", "TLBHack", &m_LocalCoreStartupParameter.iTLBHack, 0);
ini.Get("Core", "FrameLimit", &m_InterfaceFramelimit,0); ini.Get("Core", "FrameLimit", &m_Framelimit,0);
// Wii // Wii
ini.Get("Wii", "Widescreen", &m_LocalCoreStartupParameter.bWidescreen, false); ini.Get("Wii", "Widescreen", &m_LocalCoreStartupParameter.bWidescreen, false);

2
Source/Core/Core/Src/ConfigManager.h
View File

@ -66,7 +66,7 @@ struct SConfig
// interface language // interface language
INTERFACE_LANGUAGE m_InterfaceLanguage; INTERFACE_LANGUAGE m_InterfaceLanguage;
// framelimit choose // framelimit choose
u32 m_InterfaceFramelimit; u32 m_Framelimit;
// other interface settings // other interface settings
bool m_InterfaceToolbar; bool m_InterfaceToolbar;
bool m_InterfaceStatusbar; bool m_InterfaceStatusbar;

2
Source/Core/Core/Src/Core.cpp
View File

@ -658,7 +658,7 @@ void Callback_VideoCopiedToXFB()
static u64 idleTicks = 0; static u64 idleTicks = 0;
u32 targetfps = (SConfig::GetInstance().m_InterfaceFramelimit)*5; u32 targetfps = (SConfig::GetInstance().m_Framelimit)*5;
static u64 old_frametime=0; static u64 old_frametime=0;
u64 new_frametime; u64 new_frametime;
s16 wait_frametime; s16 wait_frametime;

20
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -45,7 +45,6 @@ EVT_RADIOBOX(ID_INTERFACE_THEME, CConfigMain::CoreSettingsChanged)
EVT_CHECKBOX(ID_INTERFACE_WIIMOTE_LEDS, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_INTERFACE_WIIMOTE_LEDS, CConfigMain::CoreSettingsChanged)
EVT_CHECKBOX(ID_INTERFACE_WIIMOTE_SPEAKERS, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_INTERFACE_WIIMOTE_SPEAKERS, CConfigMain::CoreSettingsChanged)
EVT_CHOICE(ID_INTERFACE_LANG, CConfigMain::CoreSettingsChanged) EVT_CHOICE(ID_INTERFACE_LANG, CConfigMain::CoreSettingsChanged)
EVT_CHOICE(ID_INTERFACE_FRAMELIMIT, CConfigMain::CoreSettingsChanged)
EVT_CHECKBOX(ID_ALLWAYS_HLEBIOS, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_ALLWAYS_HLEBIOS, CConfigMain::CoreSettingsChanged)
EVT_CHECKBOX(ID_USEDYNAREC, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_USEDYNAREC, CConfigMain::CoreSettingsChanged)
@ -55,6 +54,7 @@ EVT_CHECKBOX(ID_LOCKTHREADS, CConfigMain::CoreSettingsChanged)
EVT_CHECKBOX(ID_OPTIMIZEQUANTIZERS, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_OPTIMIZEQUANTIZERS, CConfigMain::CoreSettingsChanged)
EVT_CHECKBOX(ID_IDLESKIP, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_IDLESKIP, CConfigMain::CoreSettingsChanged)
EVT_CHECKBOX(ID_ENABLECHEATS, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_ENABLECHEATS, CConfigMain::CoreSettingsChanged)
EVT_CHOICE(ID_FRAMELIMIT, CConfigMain::CoreSettingsChanged)
EVT_CHOICE(ID_GC_SRAM_LNG, CConfigMain::GCSettingsChanged) EVT_CHOICE(ID_GC_SRAM_LNG, CConfigMain::GCSettingsChanged)
EVT_CHOICE(ID_GC_EXIDEVICE_SLOTA, CConfigMain::GCSettingsChanged) EVT_CHOICE(ID_GC_EXIDEVICE_SLOTA, CConfigMain::GCSettingsChanged)
@ -257,9 +257,9 @@ void CConfigMain::CreateGUIControls()
InterfaceLang->SetSelection(SConfig::GetInstance().m_InterfaceLanguage); InterfaceLang->SetSelection(SConfig::GetInstance().m_InterfaceLanguage);
// Choose Framelimit // Choose Framelimit
wxStaticText *InterfaceFramelimitText = new wxStaticText(GeneralPage, ID_INTERFACE_FRAMELIMIT_TEXT, wxT("Framelimit (experimental):"), wxDefaultPosition, wxDefaultSize); wxStaticText *FramelimitText = new wxStaticText(GeneralPage, ID_FRAMELIMIT_TEXT, wxT("Framelimit (experimental):"), wxDefaultPosition, wxDefaultSize);
InterfaceFramelimit = new wxChoice(GeneralPage, ID_INTERFACE_FRAMELIMIT, wxDefaultPosition, wxDefaultSize, arrayStringFor_Framelimit, 0, wxDefaultValidator); Framelimit = new wxChoice(GeneralPage, ID_FRAMELIMIT, wxDefaultPosition, wxDefaultSize, arrayStringFor_Framelimit, 0, wxDefaultValidator);
InterfaceFramelimit->SetSelection(SConfig::GetInstance().m_InterfaceFramelimit); Framelimit->SetSelection(SConfig::GetInstance().m_Framelimit);
// Themes // Themes
wxArrayString ThemeChoices; wxArrayString ThemeChoices;
@ -331,10 +331,10 @@ void CConfigMain::CreateGUIControls()
sInterfaceLanguage->Add(InterfaceLangText, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); sInterfaceLanguage->Add(InterfaceLangText, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
sInterfaceLanguage->Add(InterfaceLang, 0, wxEXPAND | wxALL, 5); sInterfaceLanguage->Add(InterfaceLang, 0, wxEXPAND | wxALL, 5);
sbInterface->Add(sInterfaceLanguage, 0, wxEXPAND | wxALL, 5); sbInterface->Add(sInterfaceLanguage, 0, wxEXPAND | wxALL, 5);
wxBoxSizer *sInterfaceFramelimit = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *sFramelimit = new wxBoxSizer(wxHORIZONTAL);
sInterfaceFramelimit->Add(InterfaceFramelimitText, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); sFramelimit->Add(FramelimitText, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
sInterfaceFramelimit->Add(InterfaceFramelimit, 0, wxEXPAND | wxALL, 5); sFramelimit->Add(Framelimit, 0, wxEXPAND | wxALL, 5);
sbInterface->Add(sInterfaceFramelimit, 0, wxEXPAND | wxALL, 5); sbInterface->Add(sFramelimit, 0, wxEXPAND | wxALL, 5);
// Populate the entire page // Populate the entire page
sGeneralPage = new wxBoxSizer(wxVERTICAL); sGeneralPage = new wxBoxSizer(wxVERTICAL);
@ -655,8 +655,8 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event)
SConfig::GetInstance().m_InterfaceLanguage = (INTERFACE_LANGUAGE)InterfaceLang->GetSelection(); SConfig::GetInstance().m_InterfaceLanguage = (INTERFACE_LANGUAGE)InterfaceLang->GetSelection();
bRefreshList = true; bRefreshList = true;
break; break;
case ID_INTERFACE_FRAMELIMIT: case ID_FRAMELIMIT:
SConfig::GetInstance().m_InterfaceFramelimit = (u32)InterfaceFramelimit->GetSelection(); SConfig::GetInstance().m_Framelimit = (u32)Framelimit->GetSelection();
break; break;
case ID_ALLWAYS_HLEBIOS: // Core case ID_ALLWAYS_HLEBIOS: // Core
SConfig::GetInstance().m_LocalCoreStartupParameter.bHLEBios = AlwaysUseHLEBIOS->IsChecked(); SConfig::GetInstance().m_LocalCoreStartupParameter.bHLEBios = AlwaysUseHLEBIOS->IsChecked();

4
Source/Core/DolphinWX/Src/ConfigMain.h
View File

@ -57,7 +57,7 @@ class CConfigMain
wxChoice* InterfaceLang; wxChoice* InterfaceLang;
wxArrayString arrayStringFor_Framelimit; wxArrayString arrayStringFor_Framelimit;
wxChoice* InterfaceFramelimit; wxChoice* Framelimit;
wxRadioBox* Theme; wxRadioBox* Theme;
@ -229,7 +229,7 @@ class CConfigMain
ID_INTERFACE_WIIMOTE_TEXT, ID_INTERFACE_WIIMOTE_LEDS, ID_INTERFACE_WIIMOTE_SPEAKERS, ID_INTERFACE_WIIMOTE_TEXT, ID_INTERFACE_WIIMOTE_LEDS, ID_INTERFACE_WIIMOTE_SPEAKERS,
ID_INTERFACE_LANG_TEXT, ID_INTERFACE_LANG, ID_INTERFACE_LANG_TEXT, ID_INTERFACE_LANG,
ID_INTERFACE_THEME, ID_INTERFACE_THEME,
ID_INTERFACE_FRAMELIMIT_TEXT, ID_INTERFACE_FRAMELIMIT, ID_FRAMELIMIT_TEXT, ID_FRAMELIMIT,
ID_GC_SRAM_LNG_TEXT, ID_GC_SRAM_LNG_TEXT,
ID_GC_SRAM_LNG, ID_GC_SRAM_LNG,

2
Source/Core/DolphinWX/Src/Summarize.h
View File

@ -94,7 +94,7 @@ std::string Summarize_Settings()
Core::GetStartupParameter().bRunCompareServer?"True":"False", Core::GetStartupParameter().bRunCompareServer?"True":"False",
Core::GetStartupParameter().bRunCompareClient?"True":"False", Core::GetStartupParameter().bRunCompareClient?"True":"False",
Core::GetStartupParameter().iTLBHack?"True":"False", Core::GetStartupParameter().iTLBHack?"True":"False",
SConfig::GetInstance().m_InterfaceFramelimit*5, SConfig::GetInstance().m_Framelimit*5,
Core::GetStartupParameter().bWidescreen?"True":"False", Core::GetStartupParameter().bWidescreen?"True":"False",
Core::GetStartupParameter().bProgressiveScan?"True":"False" Core::GetStartupParameter().bProgressiveScan?"True":"False"
); );