diff options
| author | Chris Robinson <[email protected]> | 2018-12-06 22:24:20 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2018-12-06 22:24:20 -0800 |
| commit | 0f24139b57460c71d66b9a090217d34706d64dde (patch) | |
| tree | 29138a2a4d6ff0734f4c205983cc7d6711790c6e /Alc | |
| parent | 42d26472eb514a2fcb1eafbed93f56a697ebb3a0 (diff) | |
Use a constructor instead of a macro to initialize AsyncEvent
Diffstat (limited to 'Alc')
| -rw-r--r-- | Alc/alu.cpp | 6 | ||||
| -rw-r--r-- | Alc/mixvoice.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Alc/alu.cpp b/Alc/alu.cpp index 4a8b6687..f2068ead 100644 --- a/Alc/alu.cpp +++ b/Alc/alu.cpp @@ -288,7 +288,7 @@ void SendSourceStoppedEvent(ALCcontext *context, ALuint id) ALbitfieldSOFT enabledevt{context->EnabledEvts.load(std::memory_order_acquire)}; if(!(enabledevt&EventType_SourceStateChange)) return; - AsyncEvent evt{ASYNC_EVENT(EventType_SourceStateChange)}; + AsyncEvent evt{EventType_SourceStateChange}; evt.u.srcstate.id = id; evt.u.srcstate.state = AL_STOPPED; @@ -414,7 +414,7 @@ bool CalcEffectSlotParams(ALeffectslot *slot, ALCcontext *context, bool force) /* Otherwise, replace it and send off the old one with a release * event. */ - AsyncEvent evt = ASYNC_EVENT(EventType_ReleaseEffectState); + AsyncEvent evt{EventType_ReleaseEffectState}; evt.u.mEffectState = slot->Params.mEffectState; slot->Params.mEffectState = state; @@ -1811,7 +1811,7 @@ void aluHandleDisconnect(ALCdevice *device, const char *msg, ...) if(!device->Connected.exchange(AL_FALSE, std::memory_order_acq_rel)) return; - AsyncEvent evt = ASYNC_EVENT(EventType_Disconnected); + AsyncEvent evt{EventType_Disconnected}; evt.u.user.type = AL_EVENT_TYPE_DISCONNECTED_SOFT; evt.u.user.id = 0; evt.u.user.param = 0; diff --git a/Alc/mixvoice.cpp b/Alc/mixvoice.cpp index f60043d7..cd5d2504 100644 --- a/Alc/mixvoice.cpp +++ b/Alc/mixvoice.cpp @@ -722,7 +722,7 @@ ALboolean MixSource(ALvoice *voice, ALuint SourceID, ALCcontext *Context, ALsize ALbitfieldSOFT enabledevt{Context->EnabledEvts.load(std::memory_order_acquire)}; if(buffers_done > 0 && (enabledevt&EventType_BufferCompleted)) { - AsyncEvent evt{ASYNC_EVENT(EventType_BufferCompleted)}; + AsyncEvent evt{EventType_BufferCompleted}; evt.u.bufcomp.id = SourceID; evt.u.bufcomp.count = buffers_done; if(ll_ringbuffer_write(Context->AsyncEvents, &evt, 1) == 1) |