diff --git a/Alc/ALu.c b/Alc/ALu.c index f3482ad..78f1878 100644 --- a/Alc/ALu.c +++ b/Alc/ALu.c @@ -718,7 +718,7 @@ ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size) (*src)->NeedsUpdate = AL_FALSE; } - ALsource_Mix(*src, device, SamplesToDo); + MixSource(*src, device, SamplesToDo); src++; } diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h index e245227..d60416b 100644 --- a/OpenAL32/Include/alSource.h +++ b/OpenAL32/Include/alSource.h @@ -99,13 +99,11 @@ typedef struct ALsource } Params; ALvoid (*Update)(struct ALsource *self, const ALCcontext *context); - ALvoid (*Mix)(struct ALsource *self, ALCdevice *Device, ALuint SamplesToDo); // Index to itself ALuint source; } ALsource; #define ALsource_Update(s,a) ((s)->Update(s,a)) -#define ALsource_Mix(s,a,b) ((s)->Mix(s,a,b)) ALvoid ReleaseALSources(ALCcontext *Context); diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c index 4182ee1..0e1e7eb 100644 --- a/OpenAL32/alSource.c +++ b/OpenAL32/alSource.c @@ -560,8 +560,6 @@ AL_API ALvoid AL_APIENTRY alSourcei(ALuint source,ALenum eParam,ALint lValue) else Source->Update = CalcNonAttnSourceParams; - Source->Mix = MixSource; - // Increment reference counter for buffer buffer->refcount++; } @@ -1602,8 +1600,6 @@ AL_API ALvoid AL_APIENTRY alSourceQueueBuffers(ALuint source, ALsizei n, const A else Source->Update = CalcNonAttnSourceParams; - Source->Mix = MixSource; - Source->NeedsUpdate = AL_TRUE; } else if(Frequency != buffer->frequency || Format != buffer->eOriginalFormat)