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

Some work on changing comments, log messages, and variable and function names to reflect that the plugins are not plugins anymore.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7170 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2011-02-14 02:18:03 +00:00
parent cd308e2358
commit 0ae8d33149
85 changed files with 12731 additions and 9818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/AudioCommon/Src/AudioCommonConfig.cpp
View File

@ -43,7 +43,7 @@ void AudioCommonConfig::Load()
#else
file.Get("Config", "Backend", &sBackend, BACKEND_NULLSOUND);
#endif
file.Get("Config", "Frequency", &sFrequency, 48000);
file.Get("Config", "Frequency", &iFrequency, 48000);
file.Get("Config", "Volume", &m_Volume, 100);
}
@ -58,7 +58,7 @@ void AudioCommonConfig::SaveSettings()
file.Set("Config", "EnableJIT", m_EnableJIT);
file.Set("Config", "DumpAudio", m_DumpAudio);
file.Set("Config", "Backend", sBackend);
file.Set("Config", "Frequency", sFrequency);
file.Set("Config", "Frequency", iFrequency);
file.Set("Config", "Volume", m_Volume);
file.Save((std::string(File::GetUserPath(F_DSPCONFIG_IDX)).c_str()));

2
Source/Core/AudioCommon/Src/AudioCommonConfig.h
View File

@ -39,7 +39,7 @@ struct AudioCommonConfig
bool m_DumpAudio;
int m_Volume;
std::string sBackend;
int sFrequency;
int iFrequency;
// Load from given file
void Load();

4
Source/Core/AudioCommon/Src/Mixer.cpp
View File

@ -194,10 +194,8 @@ void CMixer::PushSamples(const short *samples, unsigned int num_samples)
if (m_sampleRate == 32000)
Common::AtomicAdd(m_numSamples, num_samples);
else if (m_sampleRate == 48000)
else // Assume 48000 otherwise
Common::AtomicAdd(m_numSamples, num_samples * 3 / 2);
else
PanicAlertT("Mixer: Unsupported sample rate.");
return;
}