diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-01-06 14:21:55 +0100 |
|---|---|---|
| committer | Markus Wick <degasus@users.noreply.github.com> | 2016-01-06 14:21:55 +0100 |
| commit | 86b0e7e4f2844a2e7cc94bb01683ddcc7a8f7d4f (patch) | |
| tree | 619f243959c7209b8fd71d9bcb816cf8bb2b3d4c /Source/Core/AudioCommon/Mixer.cpp | |
| parent | 7c2c73a5fd38de40e7176a4f14a504856b45b635 (diff) | |
| parent | 3ff4ec275ae931dfc946cdb09825efa7b9e60d18 (diff) | |
Merge pull request #3356 from degasus/master
Throttler: Rename "framelimiter" to "emulation speed".
Diffstat (limited to 'Source/Core/AudioCommon/Mixer.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Mixer.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index 8d2380b4cf..5d1207bbe3 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -11,7 +11,6 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HW/AudioInterface.h" -#include "Core/HW/VideoInterface.h" // UGLINESS #include "Core/PowerPC/PowerPC.h" @@ -60,11 +59,11 @@ unsigned int CMixer::MixerFifo::Mix(short* samples, unsigned int numSamples, boo //advance indexR with sample position //remember fractional offset - u32 framelimit = SConfig::GetInstance().m_Framelimit; + float emulationspeed = SConfig::GetInstance().m_EmulationSpeed; float aid_sample_rate = m_input_sample_rate + offset; - if (consider_framelimit && framelimit > 1) + if (consider_framelimit && emulationspeed > 0.0f) { - aid_sample_rate = aid_sample_rate * (framelimit - 1) * 5 / VideoInterface::TargetRefreshRate; + aid_sample_rate = aid_sample_rate * emulationspeed; } const u32 ratio = (u32)(65536.0f * aid_sample_rate / (float)m_mixer->m_sampleRate); |