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

Fix warnings

master
Marc Salem 2013-01-25 12:03:08 -08:00
parent 2f73bdcf21
commit 0165bd1cf3
3 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jni/OpenAL/Alc/ALc.c
View File

@ -2009,12 +2009,19 @@ void SetDefaultChannelOrder(ALCdevice *device)
{
switch(device->FmtChans)
{
case DevFmtMono: device->DevChannels[FRONT_CENTER] = 0; break;
case DevFmtStereo: device->DevChannels[FRONT_LEFT] = 0;
device->DevChannels[FRONT_RIGHT] = 1; break;
#ifndef STEREO_ONLY
#ifdef STEREO_ONLY
case DevFmtMono:
case DevFmtQuad:
case DevFmtX51:
case DevFmtX61:
case DevFmtX71:
break;
#else
case DevFmtMono: device->DevChannels[FRONT_CENTER] = 0; break;
case DevFmtQuad: device->DevChannels[FRONT_LEFT] = 0;
device->DevChannels[FRONT_RIGHT] = 1;
device->DevChannels[BACK_LEFT] = 2;
@ -2051,12 +2058,20 @@ void SetDefaultWFXChannelOrder(ALCdevice *device)
{
switch(device->FmtChans)
{
case DevFmtMono: device->DevChannels[FRONT_CENTER] = 0; break;
case DevFmtStereo: device->DevChannels[FRONT_LEFT] = 0;
device->DevChannels[FRONT_RIGHT] = 1; break;
#ifndef STEREO_ONLY
#ifdef STEREO_ONLY
case DevFmtMono:
case DevFmtQuad:
case DevFmtX51:
case DevFmtX61:
case DevFmtX71:
break;
#else
case DevFmtMono: device->DevChannels[FRONT_CENTER] = 0; break;
case DevFmtQuad: device->DevChannels[FRONT_LEFT] = 0;
device->DevChannels[FRONT_RIGHT] = 1;
device->DevChannels[BACK_LEFT] = 2;

18
jni/OpenAL/Alc/ALu.c
View File

@ -185,6 +185,13 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
ALSource->Params.DryGains[1][FRONT_RIGHT] = ALfpMult(DryGain, ListenerGain);
break;
#ifdef STEREO_ONLY
case DevFmtQuad:
case DevFmtX51:
case DevFmtX61:
case DevFmtX71:
break;
#else
case DevFmtQuad:
case DevFmtX51:
DryGain = ALfpMult(DryGain, aluSqrt(float2ALfp(2.0f/4.0f)));
@ -211,50 +218,61 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
ALSource->Params.DryGains[0][SIDE_LEFT] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[1][SIDE_RIGHT] = ALfpMult(DryGain, ListenerGain);
break;
#endif
}
}
break;
case FmtRear:
#ifndef STEREO_ONLY
ALSource->Params.DryGains[0][BACK_LEFT] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[1][BACK_RIGHT] = ALfpMult(DryGain, ListenerGain);
#endif
break;
case FmtQuad:
ALSource->Params.DryGains[0][FRONT_LEFT] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[1][FRONT_RIGHT] = ALfpMult(DryGain, ListenerGain);
#ifndef STEREO_ONLY
ALSource->Params.DryGains[2][BACK_LEFT] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[3][BACK_RIGHT] = ALfpMult(DryGain, ListenerGain);
#endif
break;
case FmtX51:
ALSource->Params.DryGains[0][FRONT_LEFT] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[1][FRONT_RIGHT] = ALfpMult(DryGain, ListenerGain);
#ifndef STEREO_ONLY
ALSource->Params.DryGains[2][FRONT_CENTER] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[3][LFE] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[4][BACK_LEFT] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[5][BACK_RIGHT] = ALfpMult(DryGain, ListenerGain);
#endif
break;
case FmtX61:
ALSource->Params.DryGains[0][FRONT_LEFT] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[1][FRONT_RIGHT] = ALfpMult(DryGain, ListenerGain);
#ifndef STEREO_ONLY
ALSource->Params.DryGains[2][FRONT_CENTER] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[3][LFE] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[4][BACK_CENTER] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[5][SIDE_LEFT] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[6][SIDE_RIGHT] = ALfpMult(DryGain, ListenerGain);
#endif
break;
case FmtX71:
ALSource->Params.DryGains[0][FRONT_LEFT] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[1][FRONT_RIGHT] = ALfpMult(DryGain, ListenerGain);
#ifndef STEREO_ONLY
ALSource->Params.DryGains[2][FRONT_CENTER] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[3][LFE] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[4][BACK_LEFT] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[5][BACK_RIGHT] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[6][SIDE_LEFT] = ALfpMult(DryGain, ListenerGain);
ALSource->Params.DryGains[7][SIDE_RIGHT] = ALfpMult(DryGain, ListenerGain);
#endif
break;
}

2
jni/OpenAL/OpenAL32/alBuffer.c
View File

@ -1515,7 +1515,7 @@ static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei s
NewChannels = ChannelsFromFmt(DstChannels);
NewBytes = BytesFromFmt(DstType);
assert(SrcChannels == DstChannels);
assert((int)SrcChannels == (int)DstChannels);
if(SrcType == UserFmtIMA4)
{