diff options
| -rw-r--r-- | al/auxeffectslot.cpp | 20 | ||||
| -rw-r--r-- | al/buffer.cpp | 12 | ||||
| -rw-r--r-- | al/effect.cpp | 20 | ||||
| -rw-r--r-- | al/filter.cpp | 20 | ||||
| -rw-r--r-- | al/listener.cpp | 16 | ||||
| -rw-r--r-- | al/source.cpp | 48 | ||||
| -rw-r--r-- | al/state.cpp | 28 | ||||
| -rw-r--r-- | alc/alc.cpp | 10 | ||||
| -rw-r--r-- | include/AL/alc.h | 4 | ||||
| -rw-r--r-- | include/AL/alext.h | 16 | ||||
| -rw-r--r-- | include/AL/efx.h | 64 | ||||
| -rw-r--r-- | router/alc.cpp | 4 | ||||
| -rw-r--r-- | router/router.cpp | 16 | ||||
| -rw-r--r-- | router/router.h | 10 |
14 files changed, 144 insertions, 144 deletions
diff --git a/al/auxeffectslot.cpp b/al/auxeffectslot.cpp index 6b5c9feb..62cf4514 100644 --- a/al/auxeffectslot.cpp +++ b/al/auxeffectslot.cpp @@ -248,7 +248,7 @@ ALeffectslotArray *ALeffectslot::CreatePtrArray(size_t count) noexcept } -AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots) +AL_API void AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -301,7 +301,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint *effectslots) +AL_API void AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint *effectslots) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -357,7 +357,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint value) +AL_API void AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -436,7 +436,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, const ALint *values) +AL_API void AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, const ALint *values) START_API_FUNC { switch(param) @@ -465,7 +465,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat value) +AL_API void AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -493,7 +493,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, const ALfloat *values) +AL_API void AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, const ALfloat *values) START_API_FUNC { switch(param) @@ -521,7 +521,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint *value) +AL_API void AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint *value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -551,7 +551,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, ALint *values) +AL_API void AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, ALint *values) START_API_FUNC { switch(param) @@ -580,7 +580,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat *value) +AL_API void AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat *value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -603,7 +603,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, ALfloat *values) +AL_API void AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, ALfloat *values) START_API_FUNC { switch(param) diff --git a/al/buffer.cpp b/al/buffer.cpp index 19d3c841..af1ad638 100644 --- a/al/buffer.cpp +++ b/al/buffer.cpp @@ -703,7 +703,7 @@ al::optional<DecompResult> DecomposeUserFormat(ALenum format) } // namespace -AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n, ALuint *buffers) +AL_API void AL_APIENTRY alGenBuffers(ALsizei n, ALuint *buffers) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -743,7 +743,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alDeleteBuffers(ALsizei n, const ALuint *buffers) +AL_API void AL_APIENTRY alDeleteBuffers(ALsizei n, const ALuint *buffers) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -803,7 +803,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alBufferData(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei freq) +AL_API void AL_APIENTRY alBufferData(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei freq) START_API_FUNC { alBufferStorageSOFT(buffer, format, data, size, freq, 0); } END_API_FUNC @@ -950,7 +950,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alBufferSubDataSOFT(ALuint buffer, ALenum format, const ALvoid *data, ALsizei offset, ALsizei length) +AL_API void AL_APIENTRY alBufferSubDataSOFT(ALuint buffer, ALenum format, const ALvoid *data, ALsizei offset, ALsizei length) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -1275,7 +1275,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetBufferf(ALuint buffer, ALenum param, ALfloat *value) +AL_API void AL_APIENTRY alGetBufferf(ALuint buffer, ALenum param, ALfloat *value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -1347,7 +1347,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetBufferi(ALuint buffer, ALenum param, ALint *value) +AL_API void AL_APIENTRY alGetBufferi(ALuint buffer, ALenum param, ALint *value) START_API_FUNC { ContextRef context{GetContextRef()}; diff --git a/al/effect.cpp b/al/effect.cpp index cb29ae8b..c8d71190 100644 --- a/al/effect.cpp +++ b/al/effect.cpp @@ -211,7 +211,7 @@ inline ALeffect *LookupEffect(ALCdevice *device, ALuint id) } // namespace -AL_API ALvoid AL_APIENTRY alGenEffects(ALsizei n, ALuint *effects) +AL_API void AL_APIENTRY alGenEffects(ALsizei n, ALuint *effects) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -251,7 +251,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alDeleteEffects(ALsizei n, const ALuint *effects) +AL_API void AL_APIENTRY alDeleteEffects(ALsizei n, const ALuint *effects) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -301,7 +301,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint value) +AL_API void AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -344,7 +344,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *values) +AL_API void AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *values) START_API_FUNC { switch(param) @@ -374,7 +374,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat value) +AL_API void AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -397,7 +397,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat *values) +AL_API void AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat *values) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -420,7 +420,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *value) +AL_API void AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -445,7 +445,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *values) +AL_API void AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *values) START_API_FUNC { switch(param) @@ -475,7 +475,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *value) +AL_API void AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -498,7 +498,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *values) +AL_API void AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *values) START_API_FUNC { ContextRef context{GetContextRef()}; diff --git a/al/filter.cpp b/al/filter.cpp index 8d24b87d..19d972e9 100644 --- a/al/filter.cpp +++ b/al/filter.cpp @@ -391,7 +391,7 @@ inline ALfilter *LookupFilter(ALCdevice *device, ALuint id) } // namespace -AL_API ALvoid AL_APIENTRY alGenFilters(ALsizei n, ALuint *filters) +AL_API void AL_APIENTRY alGenFilters(ALsizei n, ALuint *filters) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -431,7 +431,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alDeleteFilters(ALsizei n, const ALuint *filters) +AL_API void AL_APIENTRY alDeleteFilters(ALsizei n, const ALuint *filters) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -482,7 +482,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint value) +AL_API void AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -516,7 +516,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *values) +AL_API void AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *values) START_API_FUNC { switch(param) @@ -546,7 +546,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat value) +AL_API void AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -569,7 +569,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat *values) +AL_API void AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat *values) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -592,7 +592,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *value) +AL_API void AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -620,7 +620,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *values) +AL_API void AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *values) START_API_FUNC { switch(param) @@ -650,7 +650,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *value) +AL_API void AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -673,7 +673,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *values) +AL_API void AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *values) START_API_FUNC { ContextRef context{GetContextRef()}; diff --git a/al/listener.cpp b/al/listener.cpp index 7a14a9ba..1f045d08 100644 --- a/al/listener.cpp +++ b/al/listener.cpp @@ -44,7 +44,7 @@ } while(0) -AL_API ALvoid AL_APIENTRY alListenerf(ALenum param, ALfloat value) +AL_API void AL_APIENTRY alListenerf(ALenum param, ALfloat value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -74,7 +74,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alListener3f(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) +AL_API void AL_APIENTRY alListener3f(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -108,7 +108,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alListenerfv(ALenum param, const ALfloat *values) +AL_API void AL_APIENTRY alListenerfv(ALenum param, const ALfloat *values) START_API_FUNC { if(values) @@ -156,7 +156,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alListeneri(ALenum param, ALint /*value*/) +AL_API void AL_APIENTRY alListeneri(ALenum param, ALint /*value*/) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -234,7 +234,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetListenerf(ALenum param, ALfloat *value) +AL_API void AL_APIENTRY alGetListenerf(ALenum param, ALfloat *value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -260,7 +260,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetListener3f(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) +AL_API void AL_APIENTRY alGetListener3f(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -290,7 +290,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetListenerfv(ALenum param, ALfloat *values) +AL_API void AL_APIENTRY alGetListenerfv(ALenum param, ALfloat *values) START_API_FUNC { switch(param) @@ -332,7 +332,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetListeneri(ALenum param, ALint *value) +AL_API void AL_APIENTRY alGetListeneri(ALenum param, ALint *value) START_API_FUNC { ContextRef context{GetContextRef()}; diff --git a/al/source.cpp b/al/source.cpp index fedf98c4..08889ec0 100644 --- a/al/source.cpp +++ b/al/source.cpp @@ -2205,7 +2205,7 @@ bool GetSourcei64v(ALsource *Source, ALCcontext *Context, SourceProp prop, const } // namespace -AL_API ALvoid AL_APIENTRY alGenSources(ALsizei n, ALuint *sources) +AL_API void AL_APIENTRY alGenSources(ALsizei n, ALuint *sources) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -2247,7 +2247,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources) +AL_API void AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -2295,7 +2295,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourcef(ALuint source, ALenum param, ALfloat value) +AL_API void AL_APIENTRY alSourcef(ALuint source, ALenum param, ALfloat value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -2311,7 +2311,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alSource3f(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) +AL_API void AL_APIENTRY alSource3f(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -2330,7 +2330,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourcefv(ALuint source, ALenum param, const ALfloat *values) +AL_API void AL_APIENTRY alSourcefv(ALuint source, ALenum param, const ALfloat *values) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -2349,7 +2349,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourcedSOFT(ALuint source, ALenum param, ALdouble value) +AL_API void AL_APIENTRY alSourcedSOFT(ALuint source, ALenum param, ALdouble value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -2368,7 +2368,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alSource3dSOFT(ALuint source, ALenum param, ALdouble value1, ALdouble value2, ALdouble value3) +AL_API void AL_APIENTRY alSource3dSOFT(ALuint source, ALenum param, ALdouble value1, ALdouble value2, ALdouble value3) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -2388,7 +2388,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourcedvSOFT(ALuint source, ALenum param, const ALdouble *values) +AL_API void AL_APIENTRY alSourcedvSOFT(ALuint source, ALenum param, const ALdouble *values) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -2413,7 +2413,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourcei(ALuint source, ALenum param, ALint value) +AL_API void AL_APIENTRY alSourcei(ALuint source, ALenum param, ALint value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -2467,7 +2467,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT value) +AL_API void AL_APIENTRY alSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -2521,7 +2521,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetSourcef(ALuint source, ALenum param, ALfloat *value) +AL_API void AL_APIENTRY alGetSourcef(ALuint source, ALenum param, ALfloat *value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -2542,7 +2542,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetSource3f(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) +AL_API void AL_APIENTRY alGetSource3f(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -2567,7 +2567,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetSourcefv(ALuint source, ALenum param, ALfloat *values) +AL_API void AL_APIENTRY alGetSourcefv(ALuint source, ALenum param, ALfloat *values) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -2653,7 +2653,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetSourcei(ALuint source, ALenum param, ALint *value) +AL_API void AL_APIENTRY alGetSourcei(ALuint source, ALenum param, ALint *value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -2773,12 +2773,12 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourcePlay(ALuint source) +AL_API void AL_APIENTRY alSourcePlay(ALuint source) START_API_FUNC { alSourcePlayv(1, &source); } END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources) +AL_API void AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -2964,12 +2964,12 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourcePause(ALuint source) +AL_API void AL_APIENTRY alSourcePause(ALuint source) START_API_FUNC { alSourcePausev(1, &source); } END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourcePausev(ALsizei n, const ALuint *sources) +AL_API void AL_APIENTRY alSourcePausev(ALsizei n, const ALuint *sources) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -3040,12 +3040,12 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourceStop(ALuint source) +AL_API void AL_APIENTRY alSourceStop(ALuint source) START_API_FUNC { alSourceStopv(1, &source); } END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourceStopv(ALsizei n, const ALuint *sources) +AL_API void AL_APIENTRY alSourceStopv(ALsizei n, const ALuint *sources) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -3103,12 +3103,12 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourceRewind(ALuint source) +AL_API void AL_APIENTRY alSourceRewind(ALuint source) START_API_FUNC { alSourceRewindv(1, &source); } END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourceRewindv(ALsizei n, const ALuint *sources) +AL_API void AL_APIENTRY alSourceRewindv(ALsizei n, const ALuint *sources) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -3168,7 +3168,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourceQueueBuffers(ALuint src, ALsizei nb, const ALuint *buffers) +AL_API void AL_APIENTRY alSourceQueueBuffers(ALuint src, ALsizei nb, const ALuint *buffers) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -3289,7 +3289,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alSourceUnqueueBuffers(ALuint src, ALsizei nb, ALuint *buffers) +AL_API void AL_APIENTRY alSourceUnqueueBuffers(ALuint src, ALsizei nb, ALuint *buffers) START_API_FUNC { ContextRef context{GetContextRef()}; diff --git a/al/state.cpp b/al/state.cpp index ad67559c..8dda6f5f 100644 --- a/al/state.cpp +++ b/al/state.cpp @@ -116,7 +116,7 @@ END_API_FUNC } while(0) -AL_API ALvoid AL_APIENTRY alEnable(ALenum capability) +AL_API void AL_APIENTRY alEnable(ALenum capability) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -136,7 +136,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alDisable(ALenum capability) +AL_API void AL_APIENTRY alDisable(ALenum capability) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -439,7 +439,7 @@ START_API_FUNC } END_API_FUNC -AL_API void* AL_APIENTRY alGetPointerSOFT(ALenum pname) +AL_API ALvoid* AL_APIENTRY alGetPointerSOFT(ALenum pname) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -465,7 +465,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetBooleanv(ALenum pname, ALboolean *values) +AL_API void AL_APIENTRY alGetBooleanv(ALenum pname, ALboolean *values) START_API_FUNC { if(values) @@ -498,7 +498,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetDoublev(ALenum pname, ALdouble *values) +AL_API void AL_APIENTRY alGetDoublev(ALenum pname, ALdouble *values) START_API_FUNC { if(values) @@ -531,7 +531,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetFloatv(ALenum pname, ALfloat *values) +AL_API void AL_APIENTRY alGetFloatv(ALenum pname, ALfloat *values) START_API_FUNC { if(values) @@ -564,7 +564,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alGetIntegerv(ALenum pname, ALint *values) +AL_API void AL_APIENTRY alGetIntegerv(ALenum pname, ALint *values) START_API_FUNC { if(values) @@ -630,7 +630,7 @@ START_API_FUNC } END_API_FUNC -AL_API void AL_APIENTRY alGetPointervSOFT(ALenum pname, void **values) +AL_API void AL_APIENTRY alGetPointervSOFT(ALenum pname, ALvoid **values) START_API_FUNC { if(values) @@ -713,7 +713,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alDopplerFactor(ALfloat value) +AL_API void AL_APIENTRY alDopplerFactor(ALfloat value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -730,7 +730,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alDopplerVelocity(ALfloat value) +AL_API void AL_APIENTRY alDopplerVelocity(ALfloat value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -761,7 +761,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alSpeedOfSound(ALfloat value) +AL_API void AL_APIENTRY alSpeedOfSound(ALfloat value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -778,7 +778,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alDistanceModel(ALenum value) +AL_API void AL_APIENTRY alDistanceModel(ALenum value) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -800,7 +800,7 @@ START_API_FUNC END_API_FUNC -AL_API ALvoid AL_APIENTRY alDeferUpdatesSOFT(void) +AL_API void AL_APIENTRY alDeferUpdatesSOFT(void) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -810,7 +810,7 @@ START_API_FUNC } END_API_FUNC -AL_API ALvoid AL_APIENTRY alProcessUpdatesSOFT(void) +AL_API void AL_APIENTRY alProcessUpdatesSOFT(void) START_API_FUNC { ContextRef context{GetContextRef()}; diff --git a/alc/alc.cpp b/alc/alc.cpp index a5a04759..47fe9852 100644 --- a/alc/alc.cpp +++ b/alc/alc.cpp @@ -219,8 +219,8 @@ BackendFactory *CaptureFactory{}; ************************************************/ #define DECL(x) { #x, reinterpret_cast<void*>(x) } const struct { - const ALCchar *funcName; - ALCvoid *address; + const char *funcName; + void *address; } alcFunctions[] = { DECL(alcCreateContext), DECL(alcMakeContextCurrent), @@ -2693,7 +2693,7 @@ START_API_FUNC END_API_FUNC -ALC_API ALCvoid ALC_APIENTRY alcSuspendContext(ALCcontext *context) +ALC_API void ALC_APIENTRY alcSuspendContext(ALCcontext *context) START_API_FUNC { if(!SuspendDefers) @@ -2707,7 +2707,7 @@ START_API_FUNC } END_API_FUNC -ALC_API ALCvoid ALC_APIENTRY alcProcessContext(ALCcontext *context) +ALC_API void ALC_APIENTRY alcProcessContext(ALCcontext *context) START_API_FUNC { if(!SuspendDefers) @@ -3464,7 +3464,7 @@ START_API_FUNC } END_API_FUNC -ALC_API ALCvoid ALC_APIENTRY alcDestroyContext(ALCcontext *context) +ALC_API void ALC_APIENTRY alcDestroyContext(ALCcontext *context) START_API_FUNC { std::unique_lock<std::recursive_mutex> listlock{ListLock}; diff --git a/include/AL/alc.h b/include/AL/alc.h index f1b6709a..c73b6e91 100644 --- a/include/AL/alc.h +++ b/include/AL/alc.h @@ -211,7 +211,7 @@ ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent(ALCdevice *device, const A * Retrieve the address of a function. Given a non-NULL device, the returned * function may be device-specific. */ -ALC_API void* ALC_APIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar *funcname); +ALC_API ALCvoid* ALC_APIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar *funcname); /** * Retrieve the value of an enum. Given a non-NULL device, the returned value * may be device-specific. @@ -253,7 +253,7 @@ typedef ALCdevice* (ALC_APIENTRY *LPALCOPENDEVICE)(const ALCchar *devicename typedef ALCboolean (ALC_APIENTRY *LPALCCLOSEDEVICE)(ALCdevice *device); typedef ALCenum (ALC_APIENTRY *LPALCGETERROR)(ALCdevice *device); typedef ALCboolean (ALC_APIENTRY *LPALCISEXTENSIONPRESENT)(ALCdevice *device, const ALCchar *extname); -typedef void* (ALC_APIENTRY *LPALCGETPROCADDRESS)(ALCdevice *device, const ALCchar *funcname); +typedef ALCvoid* (ALC_APIENTRY *LPALCGETPROCADDRESS)(ALCdevice *device, const ALCchar *funcname); typedef ALCenum (ALC_APIENTRY *LPALCGETENUMVALUE)(ALCdevice *device, const ALCchar *enumname); typedef const ALCchar* (ALC_APIENTRY *LPALCGETSTRING)(ALCdevice *device, ALCenum param); typedef void (ALC_APIENTRY *LPALCGETINTEGERV)(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *values); diff --git a/include/AL/alext.h b/include/AL/alext.h index bfc7c104..ce6fa2a3 100644 --- a/include/AL/alext.h +++ b/include/AL/alext.h @@ -158,9 +158,9 @@ extern "C" { #ifndef AL_EXT_STATIC_BUFFER #define AL_EXT_STATIC_BUFFER 1 -typedef ALvoid (AL_APIENTRY*PFNALBUFFERDATASTATICPROC)(const ALint,ALenum,ALvoid*,ALsizei,ALsizei); +typedef void (AL_APIENTRY*PFNALBUFFERDATASTATICPROC)(const ALint,ALenum,ALvoid*,ALsizei,ALsizei); #ifdef AL_ALEXT_PROTOTYPES -AL_API ALvoid AL_APIENTRY alBufferDataStatic(const ALint buffer, ALenum format, ALvoid *data, ALsizei len, ALsizei freq); +AL_API void AL_APIENTRY alBufferDataStatic(const ALint buffer, ALenum format, ALvoid *data, ALsizei len, ALsizei freq); #endif #endif @@ -193,9 +193,9 @@ ALC_API ALCcontext* ALC_APIENTRY alcGetThreadContext(void); #define AL_SOFT_buffer_sub_data 1 #define AL_BYTE_RW_OFFSETS_SOFT 0x1031 #define AL_SAMPLE_RW_OFFSETS_SOFT 0x1032 -typedef ALvoid (AL_APIENTRY*PFNALBUFFERSUBDATASOFTPROC)(ALuint,ALenum,const ALvoid*,ALsizei,ALsizei); +typedef void (AL_APIENTRY*PFNALBUFFERSUBDATASOFTPROC)(ALuint,ALenum,const ALvoid*,ALsizei,ALsizei); #ifdef AL_ALEXT_PROTOTYPES -AL_API ALvoid AL_APIENTRY alBufferSubDataSOFT(ALuint buffer,ALenum format,const ALvoid *data,ALsizei offset,ALsizei length); +AL_API void AL_APIENTRY alBufferSubDataSOFT(ALuint buffer,ALenum format,const ALvoid *data,ALsizei offset,ALsizei length); #endif #endif @@ -381,11 +381,11 @@ AL_API void AL_APIENTRY alGetSourcei64vSOFT(ALuint source, ALenum param, ALint64 #ifndef AL_SOFT_deferred_updates #define AL_SOFT_deferred_updates 1 #define AL_DEFERRED_UPDATES_SOFT 0xC002 -typedef ALvoid (AL_APIENTRY*LPALDEFERUPDATESSOFT)(void); -typedef ALvoid (AL_APIENTRY*LPALPROCESSUPDATESSOFT)(void); +typedef void (AL_APIENTRY*LPALDEFERUPDATESSOFT)(void); +typedef void (AL_APIENTRY*LPALPROCESSUPDATESSOFT)(void); #ifdef AL_ALEXT_PROTOTYPES -AL_API ALvoid AL_APIENTRY alDeferUpdatesSOFT(void); -AL_API ALvoid AL_APIENTRY alProcessUpdatesSOFT(void); +AL_API void AL_APIENTRY alDeferUpdatesSOFT(void); +AL_API void AL_APIENTRY alProcessUpdatesSOFT(void); #endif #endif diff --git a/include/AL/efx.h b/include/AL/efx.h index 34085651..5ab64a64 100644 --- a/include/AL/efx.h +++ b/include/AL/efx.h @@ -243,41 +243,41 @@ typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat* typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, ALfloat*); #ifdef AL_ALEXT_PROTOTYPES -AL_API ALvoid AL_APIENTRY alGenEffects(ALsizei n, ALuint *effects); -AL_API ALvoid AL_APIENTRY alDeleteEffects(ALsizei n, const ALuint *effects); +AL_API void AL_APIENTRY alGenEffects(ALsizei n, ALuint *effects); +AL_API void AL_APIENTRY alDeleteEffects(ALsizei n, const ALuint *effects); AL_API ALboolean AL_APIENTRY alIsEffect(ALuint effect); -AL_API ALvoid AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint iValue); -AL_API ALvoid AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *piValues); -AL_API ALvoid AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat flValue); -AL_API ALvoid AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat *pflValues); -AL_API ALvoid AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *piValue); -AL_API ALvoid AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *piValues); -AL_API ALvoid AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *pflValue); -AL_API ALvoid AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *pflValues); - -AL_API ALvoid AL_APIENTRY alGenFilters(ALsizei n, ALuint *filters); -AL_API ALvoid AL_APIENTRY alDeleteFilters(ALsizei n, const ALuint *filters); +AL_API void AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint iValue); +AL_API void AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *piValues); +AL_API void AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat flValue); +AL_API void AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat *pflValues); +AL_API void AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *piValue); +AL_API void AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *piValues); +AL_API void AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *pflValue); +AL_API void AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *pflValues); + +AL_API void AL_APIENTRY alGenFilters(ALsizei n, ALuint *filters); +AL_API void AL_APIENTRY alDeleteFilters(ALsizei n, const ALuint *filters); AL_API ALboolean AL_APIENTRY alIsFilter(ALuint filter); -AL_API ALvoid AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint iValue); -AL_API ALvoid AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *piValues); -AL_API ALvoid AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat flValue); -AL_API ALvoid AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat *pflValues); -AL_API ALvoid AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *piValue); -AL_API ALvoid AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *piValues); -AL_API ALvoid AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *pflValue); -AL_API ALvoid AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *pflValues); - -AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots); -AL_API ALvoid AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint *effectslots); +AL_API void AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint iValue); +AL_API void AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *piValues); +AL_API void AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat flValue); +AL_API void AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat *pflValues); +AL_API void AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *piValue); +AL_API void AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *piValues); +AL_API void AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *pflValue); +AL_API void AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *pflValues); + +AL_API void AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots); +AL_API void AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint *effectslots); AL_API ALboolean AL_APIENTRY alIsAuxiliaryEffectSlot(ALuint effectslot); -AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint iValue); -AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, const ALint *piValues); -AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat flValue); -AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, const ALfloat *pflValues); -AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint *piValue); -AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, ALint *piValues); -AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat *pflValue); -AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, ALfloat *pflValues); +AL_API void AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint iValue); +AL_API void AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, const ALint *piValues); +AL_API void AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat flValue); +AL_API void AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, const ALfloat *pflValues); +AL_API void AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint *piValue); +AL_API void AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, ALint *piValues); +AL_API void AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat *pflValue); +AL_API void AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, ALfloat *pflValues); #endif /* Filter ranges and defaults. */ diff --git a/router/alc.cpp b/router/alc.cpp index c99e7c93..1a8538b8 100644 --- a/router/alc.cpp +++ b/router/alc.cpp @@ -17,8 +17,8 @@ #define DECL(x) { #x, reinterpret_cast<void*>(x) } struct FuncExportEntry { - const ALCchar *funcName; - ALCvoid *address; + const char *funcName; + void *address; }; static const std::array<FuncExportEntry,95> alcFunctions{{ DECL(alcCreateContext), diff --git a/router/router.cpp b/router/router.cpp index 85a75aea..3d27af24 100644 --- a/router/router.cpp +++ b/router/router.cpp @@ -360,7 +360,7 @@ PtrIntMap::~PtrIntMap() mCapacity = 0; } -ALenum PtrIntMap::insert(ALvoid *key, ALint value) +ALenum PtrIntMap::insert(void *key, int value) { std::lock_guard<std::mutex> maplock{mLock}; auto iter = std::lower_bound(mKeys, mKeys+mSize, key); @@ -370,15 +370,15 @@ ALenum PtrIntMap::insert(ALvoid *key, ALint value) { if(mSize == mCapacity) { - ALvoid **newkeys{nullptr}; + void **newkeys{nullptr}; ALsizei newcap{mCapacity ? (mCapacity<<1) : 4}; if(newcap > mCapacity) - newkeys = static_cast<ALvoid**>( + newkeys = static_cast<void**>( al_calloc(16, (sizeof(mKeys[0])+sizeof(mValues[0]))*newcap) ); if(!newkeys) return AL_OUT_OF_MEMORY; - auto newvalues = reinterpret_cast<ALint*>(&newkeys[newcap]); + auto newvalues = reinterpret_cast<int*>(&newkeys[newcap]); if(mKeys) { @@ -404,9 +404,9 @@ ALenum PtrIntMap::insert(ALvoid *key, ALint value) return AL_NO_ERROR; } -ALint PtrIntMap::removeByKey(ALvoid *key) +int PtrIntMap::removeByKey(void *key) { - ALint ret = -1; + int ret = -1; std::lock_guard<std::mutex> maplock{mLock}; auto iter = std::lower_bound(mKeys, mKeys+mSize, key); @@ -425,9 +425,9 @@ ALint PtrIntMap::removeByKey(ALvoid *key) return ret; } -ALint PtrIntMap::lookupByKey(ALvoid *key) +int PtrIntMap::lookupByKey(void *key) { - ALint ret = -1; + int ret = -1; std::lock_guard<std::mutex> maplock{mLock}; auto iter = std::lower_bound(mKeys, mKeys+mSize, key); diff --git a/router/router.h b/router/router.h index 007b6a16..70335421 100644 --- a/router/router.h +++ b/router/router.h @@ -140,9 +140,9 @@ extern std::atomic<DriverIface*> CurrentCtxDriver; class PtrIntMap { - ALvoid **mKeys{nullptr}; + void **mKeys{nullptr}; /* Shares memory with keys. */ - ALint *mValues{nullptr}; + int *mValues{nullptr}; ALsizei mSize{0}; ALsizei mCapacity{0}; @@ -152,9 +152,9 @@ public: PtrIntMap() = default; ~PtrIntMap(); - ALenum insert(ALvoid *key, ALint value); - ALint removeByKey(ALvoid *key); - ALint lookupByKey(ALvoid *key); + ALenum insert(void *key, int value); + int removeByKey(void *key); + int lookupByKey(void *key); }; |