diff options
| author | Chris Robinson <[email protected]> | 2014-06-13 13:34:19 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2014-06-13 13:34:19 -0700 |
| commit | a8deaf12f433281b8d996aa593ebff196e3a8189 (patch) | |
| tree | 12ee2e1548da800950f9568566781fe72ee9fbb1 /Alc/mixer.c | |
| parent | c29eb6348980bf101f2a043d3f3b017dc1c48538 (diff) | |
Combine the direct and send mixers
Diffstat (limited to 'Alc/mixer.c')
| -rw-r--r-- | Alc/mixer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Alc/mixer.c b/Alc/mixer.c index c7abbfed..1ecc8d88 100644 --- a/Alc/mixer.c +++ b/Alc/mixer.c @@ -358,10 +358,10 @@ ALvoid MixSource(ALactivesource *src, ALCdevice *Device, ALuint SamplesToDo) parms->Filters[chan].ActiveType ); if(!src->IsHrtf) - src->Dry.Mix(parms->OutBuffer, samples, parms->Mix.Gains[chan], - parms->Counter, OutPos, DstBufferSize); + src->Mix(samples, MaxChannels, parms->OutBuffer, parms->Mix.Gains[chan], + parms->Counter, OutPos, DstBufferSize); else - src->Dry.HrtfMix( + src->HrtfMix( parms->OutBuffer, samples, parms->Counter, src->Offset, OutPos, parms->Mix.Hrtf.IrSize, &parms->Mix.Hrtf.Params[chan], &parms->Mix.Hrtf.State[chan], DstBufferSize @@ -381,8 +381,8 @@ ALvoid MixSource(ALactivesource *src, ALCdevice *Device, ALuint SamplesToDo) Device->FilteredData, ResampledData, DstBufferSize, parms->Filters[chan].ActiveType ); - src->WetMix(parms->OutBuffer, samples, &parms->Gain, - parms->Counter, OutPos, DstBufferSize); + src->Mix(samples, 1, parms->OutBuffer, &parms->Gain, + parms->Counter, OutPos, DstBufferSize); } } /* Update positions */ |