diff options
| author | sl1nk3.s <sl1nk3.s@gmail.com> | 2009-03-28 14:08:06 +0000 |
|---|---|---|
| committer | sl1nk3.s <sl1nk3.s@gmail.com> | 2009-03-28 14:08:06 +0000 |
| commit | 632e3bfc85ef7a6085aa0a2bc987f763bef2ad4c (patch) | |
| tree | 72eb65f7fd3b297157d426ff86ede57dc4c748f9 /Source/Core | |
| parent | 881678540d7f4599cdca07a5edc525799802d6b2 (diff) | |
A little fix for the Throttle, it wasn't getting the correct sample_rate thus was too fast
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2774 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/AudioCommon/Src/Mixer.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/Src/Mixer.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/AudioCommon/Src/Mixer.cpp b/Source/Core/AudioCommon/Src/Mixer.cpp index 02cea2659c..38ce13dc2c 100644 --- a/Source/Core/AudioCommon/Src/Mixer.cpp +++ b/Source/Core/AudioCommon/Src/Mixer.cpp @@ -62,7 +62,7 @@ void CMixer::Mix(short *samples, int numSamples) } -void CMixer::PushSamples(short *samples, int num_stereo_samples) +void CMixer::PushSamples(short *samples, int num_stereo_samples, int core_sample_rate) { if (!soundStream) return; @@ -85,7 +85,7 @@ void CMixer::PushSamples(short *samples, int num_stereo_samples) #endif // Write Other Audio - if (! m_throttle) + if (!m_throttle) return; @@ -105,7 +105,7 @@ void CMixer::PushSamples(short *samples, int num_stereo_samples) push_sync.Enter(); while (num_stereo_samples) { - acc += m_sampleRate; + acc += core_sample_rate; while (num_stereo_samples && (acc >= 48000)) { PV4l=PV3l; PV3l=PV2l; diff --git a/Source/Core/AudioCommon/Src/Mixer.h b/Source/Core/AudioCommon/Src/Mixer.h index 433c70c61c..41dd544585 100644 --- a/Source/Core/AudioCommon/Src/Mixer.h +++ b/Source/Core/AudioCommon/Src/Mixer.h @@ -34,7 +34,7 @@ public: void Mix(short *sample, int numSamples); // Called from main thread - void PushSamples(short* samples, int num_stereo_samples); + void PushSamples(short* samples, int num_stereo_samples, int core_sample_rate); virtual void Premix(short *samples, int numSamples) {} |