Merge pull request #667 from RachelBryk/remove-audio-limit

Remove audio frame limit.
This commit is contained in:
Tony Wasserka
2014-07-28 14:38:35 +02:00
7 changed files with 5 additions and 30 deletions

View File

@ -264,8 +264,7 @@ void CConfigMain::InitializeGUILists()
// Framelimit
arrayStringFor_Framelimit.Add(_("Off"));
arrayStringFor_Framelimit.Add(_("Auto"));
arrayStringFor_Framelimit.Add(_("Audio"));
for (int i = 10; i <= 120; i += 5) // from 10 to 120
for (int i = 5; i <= 120; i += 5) // from 5 to 120
arrayStringFor_Framelimit.Add(wxString::Format("%i", i));
// Emulator Engine
@ -898,7 +897,6 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event)
break;
case ID_FRAMELIMIT:
SConfig::GetInstance().m_Framelimit = Framelimit->GetSelection();
AudioCommon::UpdateSoundStream();
break;
// Core - Advanced
case ID_CPUENGINE:

View File

@ -134,7 +134,6 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl*
" - Enable Dual Core [OFF]\n"
" - DSP Emulator Engine Must be the same on all computers!\n"
" - DSP on Dedicated Thread [OFF]\n"
" - Framelimit NOT set to [Audio]\n"
" - Manually set the extensions for each wiimote\n"
"\n"
"All players should use the same Dolphin version and settings.\n"