diff options
| author | nakeee <nakeee@gmail.com> | 2009-03-30 09:55:50 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-03-30 09:55:50 +0000 |
| commit | 37d513c53bad6fe80b0120773da8be50248da3df (patch) | |
| tree | a649d8c6519fe9d4f8d88aa0f39dec5d985de0e8 /Source/Core/AudioCommon/Src/Mixer.cpp | |
| parent | 5987dbf7baaf19d8eed828b6a5555559a20766fe (diff) | |
Added dtk sound mixing to audiocommon (should work with LLE now)
And also moved all common setting to audiocommonconfig
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2796 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon/Src/Mixer.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Src/Mixer.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/Core/AudioCommon/Src/Mixer.cpp b/Source/Core/AudioCommon/Src/Mixer.cpp index 3247e610a0..69bc4699fb 100644 --- a/Source/Core/AudioCommon/Src/Mixer.cpp +++ b/Source/Core/AudioCommon/Src/Mixer.cpp @@ -39,6 +39,11 @@ void CMixer::Mix(short *samples, int numSamples) return; } + // first get the DTK Music + if (m_EnableDTKMusic) { + g_dspInitialize.pGetAudioStreaming(samples, numSamples); + } + Premix(samples, numSamples); push_sync.Enter(); |