diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-03-27 09:57:03 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-03-27 09:57:03 +0100 |
| commit | 784c636db8b885dc5b6e19ecf663a634e0f450bc (patch) | |
| tree | 2e4dedb53f48b66c20ec8c0d1e1cf21b5f6ae776 /Source/Core/AudioCommon/Mixer.cpp | |
| parent | f6a343df792e9ffdc607e50f446cfdcfc3fa8cad (diff) | |
| parent | 8a3da44d9174dda0f9c0ce590931c5aa43029617 (diff) | |
Merge pull request #214 from magumagu/zelda-ucode-cleanup
Zelda ucode cleanup
Diffstat (limited to 'Source/Core/AudioCommon/Mixer.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Mixer.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index 2b785ffaf4..fa43baeb99 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -99,9 +99,6 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples, bool consider_ // Flush cached variable Common::AtomicStore(m_indexR, indexR); - // Add the DSPHLE sound, re-sampling is done inside - Premix(samples, numSamples); - // Add the DTK Music // Re-sampling is done inside AudioInterface::Callback_GetStreaming(samples, numSamples, m_sampleRate); |