diff options
| author | Chris Robinson <[email protected]> | 2010-03-19 01:26:56 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2010-03-19 01:26:56 -0700 |
| commit | 4be97dc735c53a2c5f0471737fdf8dbdbd365da2 (patch) | |
| tree | 773607e9ec9bed6cec3d6846eac6dd07275b71d8 | |
| parent | 799126df0ef03548728080e2a4723394f63e5caf (diff) | |
Use proper storage type for the new format
| -rw-r--r-- | OpenAL32/alBuffer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c index cbc10be5..293f5db6 100644 --- a/OpenAL32/alBuffer.c +++ b/OpenAL32/alBuffer.c @@ -314,7 +314,7 @@ ALAPI ALvoid ALAPIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid *d case AL_FORMAT_REAR8: case AL_FORMAT_REAR16: case AL_FORMAT_REAR32: { - ALuint NewFormat = AL_FORMAT_QUAD32; + ALenum NewFormat = AL_FORMAT_QUAD32; ALuint NewChannels = aluChannelsFromFormat(NewFormat); ALuint NewBytes = aluBytesFromFormat(NewFormat); ALuint OrigBytes = ((format==AL_FORMAT_REAR8) ? 1 : @@ -383,7 +383,7 @@ ALAPI ALvoid ALAPIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid *d case AL_FORMAT_MONO_IMA4: case AL_FORMAT_STEREO_IMA4: { int OrigChans = ((format==AL_FORMAT_MONO_IMA4) ? 1 : 2); - ALuint NewFormat = ((OrigChans==1) ? AL_FORMAT_MONO_FLOAT32 : + ALenum NewFormat = ((OrigChans==1) ? AL_FORMAT_MONO_FLOAT32 : AL_FORMAT_STEREO_FLOAT32); ALuint NewBytes = aluBytesFromFormat(NewFormat); @@ -426,7 +426,7 @@ ALAPI ALvoid ALAPIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid *d ((format==AL_FORMAT_QUAD_MULAW) ? 4 : ((format==AL_FORMAT_51CHN_MULAW) ? 6 : ((format==AL_FORMAT_61CHN_MULAW) ? 7 : 8))))); - ALuint NewFormat = ((Channels==1) ? AL_FORMAT_MONO_FLOAT32 : + ALenum NewFormat = ((Channels==1) ? AL_FORMAT_MONO_FLOAT32 : ((Channels==2) ? AL_FORMAT_STEREO_FLOAT32 : ((Channels==4) ? AL_FORMAT_QUAD32 : ((Channels==6) ? AL_FORMAT_51CHN32 : @@ -458,7 +458,7 @@ ALAPI ALvoid ALAPIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid *d case AL_FORMAT_REAR_MULAW: { int OrigChans = 2; - ALuint NewFormat = AL_FORMAT_QUAD32; + ALenum NewFormat = AL_FORMAT_QUAD32; ALuint NewBytes = aluBytesFromFormat(NewFormat); ALuint NewChannels = aluChannelsFromFormat(NewFormat); |