diff options
| author | degasus <wickmarkus@web.de> | 2014-02-06 18:41:25 +0100 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2014-02-10 16:08:03 +0100 |
| commit | a51b5f7815370cd22695595cd773f5df67b2520e (patch) | |
| tree | dfec055ab4cc6c389bd8d8724c2e3f18efb2c7cd /Source/Core/DolphinWX/ConfigMain.cpp | |
| parent | f7dc918057e66d516f0ae5632398ca641dc41920 (diff) | |
Drop framelimit by fps
Framelimit by fps can't be done per coretiming
Diffstat (limited to 'Source/Core/DolphinWX/ConfigMain.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ConfigMain.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index 28e03ae4f6..90525d8c25 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -118,7 +118,6 @@ EVT_CHECKBOX(ID_CPUTHREAD, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_IDLESKIP, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_ENABLECHEATS, CConfigMain::CoreSettingsChanged) EVT_CHOICE(ID_FRAMELIMIT, CConfigMain::CoreSettingsChanged) -EVT_CHECKBOX(ID_FRAMELIMIT_USEFPSFORLIMITING, CConfigMain::CoreSettingsChanged) EVT_RADIOBOX(ID_CPUENGINE, CConfigMain::CoreSettingsChanged) EVT_CHECKBOX(ID_NTSCJ, CConfigMain::CoreSettingsChanged) @@ -324,7 +323,6 @@ void CConfigMain::InitializeGUIValues() SkipIdle->SetValue(startup_params.bSkipIdle); EnableCheats->SetValue(startup_params.bEnableCheats); Framelimit->SetSelection(SConfig::GetInstance().m_Framelimit); - UseFPSForLimiting->SetValue(SConfig::GetInstance().b_UseFPS); // General - Advanced for (unsigned int a = 0; a < (sizeof(CPUCores) / sizeof(CPUCore)); ++a) @@ -549,7 +547,6 @@ void CConfigMain::CreateGUIControls() EnableCheats = new wxCheckBox(GeneralPage, ID_ENABLECHEATS, _("Enable Cheats"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); // Framelimit Framelimit = new wxChoice(GeneralPage, ID_FRAMELIMIT, wxDefaultPosition, wxDefaultSize, arrayStringFor_Framelimit, 0, wxDefaultValidator); - UseFPSForLimiting = new wxCheckBox(GeneralPage, ID_FRAMELIMIT_USEFPSFORLIMITING, _("Limit by FPS"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); // Core Settings - Advanced CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS); _NTSCJ = new wxCheckBox(GeneralPage, ID_NTSCJ, _("Force Console as NTSC-J"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); @@ -558,7 +555,6 @@ void CConfigMain::CreateGUIControls() wxBoxSizer* sFramelimit = new wxBoxSizer(wxHORIZONTAL); sFramelimit->Add(TEXT_BOX(GeneralPage, _("Framelimit:")), 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxBOTTOM, 5); sFramelimit->Add(Framelimit, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, 5); - sFramelimit->Add(UseFPSForLimiting, 0, wxALL | wxEXPAND, 5); wxStaticBoxSizer* const sbBasic = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Basic Settings")); sbBasic->Add(CPUThread, 0, wxALL, 5); sbBasic->Add(SkipIdle, 0, wxALL, 5); @@ -890,9 +886,6 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event) SConfig::GetInstance().m_Framelimit = Framelimit->GetSelection(); AudioCommon::UpdateSoundStream(); break; - case ID_FRAMELIMIT_USEFPSFORLIMITING: - SConfig::GetInstance().b_UseFPS = UseFPSForLimiting->IsChecked(); - break; // Core - Advanced case ID_CPUENGINE: SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore = CPUCores[CPUEngine->GetSelection()].CPUid; |