diff options
| author | Chris Robinson <[email protected]> | 2012-03-13 14:49:58 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2012-03-13 14:49:58 -0700 |
| commit | b5ed2a5351c065fb1de5ecc52e3d981458cd2f2c (patch) | |
| tree | 2f7d3e15ebb4905390a5e3e5554c8acdf8701f41 /OpenAL32 | |
| parent | 55c5e4fe92eefc4c9208a4f6ac967247a4c4ab34 (diff) | |
Pass a device to the effect update functions
Diffstat (limited to 'OpenAL32')
| -rw-r--r-- | OpenAL32/Include/alAuxEffectSlot.h | 2 | ||||
| -rw-r--r-- | OpenAL32/alAuxEffectSlot.c | 6 | ||||
| -rw-r--r-- | OpenAL32/alState.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h index 6323f6f5..2d5df671 100644 --- a/OpenAL32/Include/alAuxEffectSlot.h +++ b/OpenAL32/Include/alAuxEffectSlot.h @@ -41,7 +41,7 @@ ALvoid ReleaseALAuxiliaryEffectSlots(ALCcontext *Context); struct ALeffectState { ALvoid (*Destroy)(ALeffectState *State); ALboolean (*DeviceUpdate)(ALeffectState *State, ALCdevice *Device); - ALvoid (*Update)(ALeffectState *State, ALCcontext *Context, const ALeffectslot *Slot); + ALvoid (*Update)(ALeffectState *State, ALCdevice *Device, const ALeffectslot *Slot); ALvoid (*Process)(ALeffectState *State, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS]); }; diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c index 38b182df..9668eafe 100644 --- a/OpenAL32/alAuxEffectSlot.c +++ b/OpenAL32/alAuxEffectSlot.c @@ -427,10 +427,10 @@ static ALboolean NoneDeviceUpdate(ALeffectState *State, ALCdevice *Device) (void)State; (void)Device; } -static ALvoid NoneUpdate(ALeffectState *State, ALCcontext *Context, const ALeffectslot *Slot) +static ALvoid NoneUpdate(ALeffectState *State, ALCdevice *Device, const ALeffectslot *Slot) { (void)State; - (void)Context; + (void)Device; (void)Slot; } static ALvoid NoneProcess(ALeffectState *State, ALuint SamplesToDo, const ALfloat *SamplesIn, ALfloat (*SamplesOut)[MAXCHANNELS]) @@ -566,7 +566,7 @@ ALvoid InitializeEffect(ALCcontext *Context, ALeffectslot *EffectSlot, ALeffect * object was changed, it needs an update before its Process method can * be called. */ EffectSlot->NeedsUpdate = AL_FALSE; - ALeffectState_Update(EffectSlot->EffectState, Context, EffectSlot); + ALeffectState_Update(EffectSlot->EffectState, Context->Device, EffectSlot); UnlockContext(Context); RestoreFPUMode(oldMode); diff --git a/OpenAL32/alState.c b/OpenAL32/alState.c index c50df9e6..ec6ee827 100644 --- a/OpenAL32/alState.c +++ b/OpenAL32/alState.c @@ -617,7 +617,7 @@ AL_API ALvoid AL_APIENTRY alDeferUpdatesSOFT(void) while(slot != slot_end) { if(ExchangeInt(&(*slot)->NeedsUpdate, AL_FALSE)) - ALeffectState_Update((*slot)->EffectState, Context, *slot); + ALeffectState_Update((*slot)->EffectState, Context->Device, *slot); slot++; } |