Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combine two arrays

Browse Source
This commit is contained in:
Chris Robinson
2015-10-01 01:05:08 -07:00
parent 07f80eb4e1
commit 0fcd497796
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/mixer.c
+11 -13
View File
@@ -57,17 +57,15 @@ enum Resampler {
static enum Resampler DefaultResampler = LinearResampler;
static const ALsizei ResamplerPadding[ResamplerMax] = {
0, /* Point */
1, /* Linear */
2, /* FIR4 */
3, /* FIR6 */
};
static const ALsizei ResamplerPrePadding[ResamplerMax] = {
0, /* Point */
0, /* Linear */
1, /* FIR4 */
2, /* FIR6 */
/* Each entry is a pair, where the first is the number of samples needed before
* the current position, and the second is the number of samples needed after
* (not including) the current position, for the given resampler.
*/
static const ALsizei ResamplerPadding[ResamplerMax][2] = {
{0, 0}, /* Point */
{0, 1}, /* Linear */
{1, 2}, /* FIR4 */
{2, 3}, /* FIR6 */
};
@@ -334,8 +332,8 @@ ALvoid MixSource(ALvoice *voice, ALsource *Source, ALCdevice *Device, ALuint Sam
OutPos = 0;
do {
const ALuint BufferPrePadding = ResamplerPrePadding[DefaultResampler];
const ALuint BufferPadding = ResamplerPadding[DefaultResampler];
const ALuint BufferPrePadding = ResamplerPadding[DefaultResampler][0];
const ALuint BufferPadding = ResamplerPadding[DefaultResampler][1];
ALuint SrcBufferSize, DstBufferSize;
/* Figure out how many buffer samples will be needed */