kcat/openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some casts to pacify MSVC

Browse Source
This commit is contained in:
Chris Robinson 2018-01-27 11:50:06 -08:00
parent f76ab02bd4
commit c4a76af397
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenAL32/alBuffer.c
View File

@ -1252,15 +1252,15 @@ static ALbuffer *AllocBuffer(ALCcontext *context)
if(UNLIKELY(!buffer))
{
const BufferSubList empty_sublist = { 0, NULL };
lidx = VECTOR_SIZE(device->BufferList);
/* Don't allocate so many list entries that the 32-bit ID could
* overflow...
*/
if(UNLIKELY(lidx >= 1<<25))
if(UNLIKELY(VECTOR_SIZE(device->BufferList) >= 1<<25))
{
almtx_unlock(&device->BufferLock);
return NULL;
}
lidx = (ALsizei)VECTOR_SIZE(device->BufferList);
VECTOR_PUSH_BACK(device->BufferList, empty_sublist);
sublist = &VECTOR_BACK(device->BufferList);
sublist->FreeMask = ~U64(0);

4
OpenAL32/alError.c
View File

@ -48,14 +48,14 @@ void alSetError(ALCcontext *context, ALenum errorCode, const char *msg, ...)
if(msglen < 0 || (size_t)msglen >= sizeof(message))
{
message[sizeof(message)-1] = 0;
msglen = strlen(message);
msglen = (int)strlen(message);
}
if(msglen > 0)
msg = message;
else
{
msg = "<internal error constructing message>";
msglen = strlen(msg);
msglen = (int)strlen(msg);
}
WARN("Error generated on context %p, code 0x%04x, \"%s\"\n",

3
OpenAL32/alState.c
View File

@ -720,9 +720,10 @@ AL_API ALvoid AL_APIENTRY alDopplerVelocity(ALfloat value)
{
static const ALCchar msg[] =
"alDopplerVelocity is deprecated in AL1.1, use alSpeedOfSound";
const ALsizei msglen = (ALsizei)strlen(msg);
almtx_lock(&context->EventLock);
if((context->EnabledEvts&EventType_Deprecated) && context->EventCb)
(*context->EventCb)(AL_EVENT_TYPE_DEPRECATED_SOFT, 0, 0, strlen(msg), msg,
(*context->EventCb)(AL_EVENT_TYPE_DEPRECATED_SOFT, 0, 0, msglen, msg,
context->EventParam);
almtx_unlock(&context->EventLock);
}