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

Silence some MSVC precision warnings

Browse Source
This commit is contained in:
Chris Robinson
2011-09-22 00:35:08 -07:00
parent 0988023d30
commit 43350f9066
5 changed files with 42 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/ALu.c
+2 -2
View File
@@ -161,7 +161,7 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
ALSource->Params.Step = maxstep<<FRACTIONBITS;
else
{
ALSource->Params.Step = Pitch*FRACTIONONE;
ALSource->Params.Step = (ALint)(Pitch*FRACTIONONE);
if(ALSource->Params.Step == 0)
ALSource->Params.Step = 1;
}
@@ -676,7 +676,7 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
ALSource->Params.Step = maxstep<<FRACTIONBITS;
else
{
ALSource->Params.Step = Pitch*FRACTIONONE;
ALSource->Params.Step = (ALint)(Pitch*FRACTIONONE);
if(ALSource->Params.Step == 0)
ALSource->Params.Step = 1;
}
OpenAL32/alBuffer.c
+10 -10
View File
@@ -1368,19 +1368,19 @@ static __inline ALfloat Conv_ALfloat_ALshort(ALshort val)
static __inline ALfloat Conv_ALfloat_ALushort(ALushort val)
{ return (val-32768) * (1.0f/32767.0f); }
static __inline ALfloat Conv_ALfloat_ALint(ALint val)
{ return val * (1.0/2147483647.0); }
{ return (ALfloat)(val * (1.0/2147483647.0)); }
static __inline ALfloat Conv_ALfloat_ALuint(ALuint val)
{ return (ALint)(val-2147483648u) * (1.0/2147483647.0); }
{ return (ALfloat)((ALint)(val-2147483648u) * (1.0/2147483647.0)); }
static __inline ALfloat Conv_ALfloat_ALfloat(ALfloat val)
{ return (val==val) ? val : 0.0f; }
static __inline ALfloat Conv_ALfloat_ALdouble(ALdouble val)
{ return (val==val) ? val : 0.0; }
{ return (val==val) ? (ALfloat)val : 0.0f; }
static __inline ALfloat Conv_ALfloat_ALmulaw(ALmulaw val)
{ return Conv_ALfloat_ALshort(DecodeMuLaw(val)); }
static __inline ALfloat Conv_ALfloat_ALbyte3(ALbyte3 val)
{ return DecodeByte3(val) * (1.0/8388607.0); }
{ return (ALfloat)(DecodeByte3(val) * (1.0/8388607.0)); }
static __inline ALfloat Conv_ALfloat_ALubyte3(ALubyte3 val)
{ return (DecodeUByte3(val)-8388608) * (1.0/8388607.0); }
{ return (ALfloat)((DecodeUByte3(val)-8388608) * (1.0/8388607.0)); }
static __inline ALdouble Conv_ALdouble_ALbyte(ALbyte val)
{ return val * (1.0/127.0); }
@@ -1823,14 +1823,14 @@ static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei f
return AL_OUT_OF_MEMORY;
}
temp = realloc(ALBuf->data, newsize);
temp = realloc(ALBuf->data, (size_t)newsize);
if(!temp && newsize)
{
WriteUnlock(&ALBuf->lock);
return AL_OUT_OF_MEMORY;
}
ALBuf->data = temp;
ALBuf->size = newsize;
ALBuf->size = (ALsizei)newsize;
if(data != NULL)
ConvertData(ALBuf->data, DstType, data, SrcType, NewChannels, frames);
@@ -1857,14 +1857,14 @@ static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei f
return AL_OUT_OF_MEMORY;
}
temp = realloc(ALBuf->data, newsize);
temp = realloc(ALBuf->data, (size_t)newsize);
if(!temp && newsize)
{
WriteUnlock(&ALBuf->lock);
return AL_OUT_OF_MEMORY;
}
ALBuf->data = temp;
ALBuf->size = newsize;
ALBuf->size = (ALsizei)newsize;
if(data != NULL)
ConvertData(ALBuf->data, DstType, data, SrcType, NewChannels, frames);
@@ -1890,7 +1890,7 @@ static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei f
ALBuf->FmtType = DstType;
ALBuf->LoopStart = 0;
ALBuf->LoopEnd = newsize / NewChannels / NewBytes;
ALBuf->LoopEnd = (ALsizei)(newsize / NewChannels / NewBytes);
WriteUnlock(&ALBuf->lock);
return AL_NO_ERROR;
OpenAL32/alEffect.c
+26 -37
View File
@@ -1003,43 +1003,6 @@ static void echo_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param,
}
static void mod_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
{
switch(param)
{
case AL_RING_MODULATOR_FREQUENCY:
if(val >= AL_RING_MODULATOR_MIN_FREQUENCY &&
val <= AL_RING_MODULATOR_MAX_FREQUENCY)
effect->Modulator.Frequency = val;
else
alSetError(context, AL_INVALID_VALUE);
break;
case AL_RING_MODULATOR_HIGHPASS_CUTOFF:
if(val >= AL_RING_MODULATOR_MIN_HIGHPASS_CUTOFF &&
val <= AL_RING_MODULATOR_MAX_HIGHPASS_CUTOFF)
effect->Modulator.HighPassCutoff = val;
else
alSetError(context, AL_INVALID_VALUE);
break;
case AL_RING_MODULATOR_WAVEFORM:
if(val >= AL_RING_MODULATOR_MIN_WAVEFORM &&
val <= AL_RING_MODULATOR_MAX_WAVEFORM)
effect->Modulator.Waveform = val;
else
alSetError(context, AL_INVALID_VALUE);
break;
default:
alSetError(context, AL_INVALID_ENUM);
break;
}
}
static void mod_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
{
mod_SetParami(effect, context, param, vals[0]);
}
static void mod_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
{
switch(param)
@@ -1069,6 +1032,32 @@ static void mod_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param,
{
mod_SetParamf(effect, context, param, vals[0]);
}
static void mod_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
{
switch(param)
{
case AL_RING_MODULATOR_FREQUENCY:
case AL_RING_MODULATOR_HIGHPASS_CUTOFF:
mod_SetParamf(effect, context, param, (ALfloat)val);
break;
case AL_RING_MODULATOR_WAVEFORM:
if(val >= AL_RING_MODULATOR_MIN_WAVEFORM &&
val <= AL_RING_MODULATOR_MAX_WAVEFORM)
effect->Modulator.Waveform = val;
else
alSetError(context, AL_INVALID_VALUE);
break;
default:
alSetError(context, AL_INVALID_ENUM);
break;
}
}
static void mod_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
{
mod_SetParami(effect, context, param, vals[0]);
}
static void mod_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
{
OpenAL32/alListener.c
+1 -1
View File
@@ -226,7 +226,7 @@ AL_API void AL_APIENTRY alListeneriv( ALenum eParam, const ALint* plValues )
{
case AL_POSITION:
case AL_VELOCITY:
alListener3f(eParam, plValues[0], plValues[1], plValues[2]);
alListener3f(eParam, (ALfloat)plValues[0], (ALfloat)plValues[1], (ALfloat)plValues[2]);
return;
case AL_ORIENTATION:
OpenAL32/alSource.c
+3 -3
View File
@@ -940,7 +940,7 @@ AL_API ALvoid AL_APIENTRY alGetSourcef(ALuint source, ALenum eParam, ALfloat *pf
pContext->Device->Frequency;
GetSourceOffset(Source, eParam, Offsets, updateLen);
UnlockContext(pContext);
*pflValue = Offsets[0];
*pflValue = (ALfloat)Offsets[0];
break;
case AL_CONE_INNER_ANGLE:
@@ -1087,8 +1087,8 @@ AL_API ALvoid AL_APIENTRY alGetSourcefv(ALuint source, ALenum eParam, ALfloat *p
pContext->Device->Frequency;
GetSourceOffset(Source, eParam, Offsets, updateLen);
UnlockContext(pContext);
pflValues[0] = Offsets[0];
pflValues[1] = Offsets[1];
pflValues[0] = (ALfloat)Offsets[0];
pflValues[1] = (ALfloat)Offsets[1];
break;
default: