diff options
| -rw-r--r-- | Alc/mixer.c | 4 | ||||
| -rw-r--r-- | OpenAL32/Include/alSource.h | 2 | ||||
| -rw-r--r-- | OpenAL32/Include/alu.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Alc/mixer.c b/Alc/mixer.c index 0d52b9e3..ef1517b3 100644 --- a/Alc/mixer.c +++ b/Alc/mixer.c @@ -359,7 +359,7 @@ ALvoid MixSource(ALactivesource *src, ALCdevice *Device, ALuint SamplesToDo) parms->Counter, OutPos, DstBufferSize); else src->Dry.HrtfMix( - parms->OutBuffer, samples, parms->Counter, parms->Offset, + parms->OutBuffer, samples, parms->Counter, src->Offset, OutPos, parms->Mix.Hrtf.IrSize, &parms->Mix.Hrtf.Params[chan], &parms->Mix.Hrtf.State[chan], DstBufferSize ); @@ -390,7 +390,7 @@ ALvoid MixSource(ALactivesource *src, ALCdevice *Device, ALuint SamplesToDo) DataPosFrac &= FRACTIONMASK; } OutPos += DstBufferSize; - src->Direct.Offset += DstBufferSize; + src->Offset += DstBufferSize; src->Direct.Counter = maxu(src->Direct.Counter, DstBufferSize) - DstBufferSize; for(j = 0;j < Device->NumAuxSends;j++) src->Send[j].Counter = maxu(src->Send[j].Counter, DstBufferSize) - DstBufferSize; diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h index 0839e5b9..f87f1672 100644 --- a/OpenAL32/Include/alSource.h +++ b/OpenAL32/Include/alSource.h @@ -41,6 +41,8 @@ typedef struct ALactivesource { ALboolean IsHrtf; ALint Step; + ALuint Offset; /* Number of output samples mixed since starting. */ + DirectParams Direct; SendParams Send[MAX_SENDS]; } ALactivesource; diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index df0e923d..98663c7d 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -80,8 +80,6 @@ typedef struct DirectParams { ALboolean Moving; /* Stepping counter for gain/coefficient fading. */ ALuint Counter; - /* History/coefficient offset. */ - ALuint Offset; struct { enum ActiveFilters ActiveType; |