From e1c0b5ea24bbe2db24cf4f81a708d4d565d37f78 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Thu, 25 Nov 2010 23:09:18 -0800 Subject: Call MixSource directly, instead of through a function pointer --- OpenAL32/Include/alSource.h | 2 -- OpenAL32/alSource.c | 4 ---- 2 files changed, 6 deletions(-) (limited to 'OpenAL32') diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h index e2452279..d60416b6 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 4182ee15..0e1e7eb7 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) -- cgit v1.2.3