diff options
| author | Chris Robinson <[email protected]> | 2011-10-01 19:52:07 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2011-10-01 19:52:07 -0700 |
| commit | eb0b96752a61c51e0625a3b7578291210e9b7542 (patch) | |
| tree | 9d49a5581277a23a9dc183764d7c78050c6ff889 /OpenAL32 | |
| parent | 2f453eba35fa82b64929c2aac49d88c8be1a84d6 (diff) | |
Remove the OriginalAlign buffer field, and calculate it as needed
Diffstat (limited to 'OpenAL32')
| -rw-r--r-- | OpenAL32/Include/alBuffer.h | 3 | ||||
| -rw-r--r-- | OpenAL32/alBuffer.c | 17 |
2 files changed, 12 insertions, 8 deletions
diff --git a/OpenAL32/Include/alBuffer.h b/OpenAL32/Include/alBuffer.h index d68a4e36..0a04316b 100644 --- a/OpenAL32/Include/alBuffer.h +++ b/OpenAL32/Include/alBuffer.h @@ -78,8 +78,7 @@ typedef struct ALbuffer enum UserFmtChannels OriginalChannels; enum UserFmtType OriginalType; - ALsizei OriginalSize; - ALsizei OriginalAlign; + ALsizei OriginalSize; ALsizei LoopStart; ALsizei LoopEnd; diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c index 712acc94..f3ecb3f5 100644 --- a/OpenAL32/alBuffer.c +++ b/OpenAL32/alBuffer.c @@ -446,13 +446,21 @@ AL_API ALvoid AL_APIENTRY alBufferSubDataSOFT(ALuint buffer,ALenum format,const alSetError(Context, AL_INVALID_ENUM); else { + ALuint original_align; + WriteLock(&ALBuf->lock); + + original_align = ((ALBuf->OriginalType == UserFmtIMA4) ? + (ChannelsFromUserFmt(ALBuf->OriginalChannels)*36) : + FrameSizeFromUserFmt(ALBuf->OriginalChannels, + ALBuf->OriginalType)); + if(SrcChannels != ALBuf->OriginalChannels || SrcType != ALBuf->OriginalType) alSetError(Context, AL_INVALID_ENUM); else if(offset > ALBuf->OriginalSize || length > ALBuf->OriginalSize-offset || - (offset%ALBuf->OriginalAlign) != 0 || - (length%ALBuf->OriginalAlign) != 0) + (offset%original_align) != 0 || + (length%original_align) != 0) alSetError(Context, AL_INVALID_VALUE); else { @@ -464,7 +472,7 @@ AL_API ALvoid AL_APIENTRY alBufferSubDataSOFT(ALuint buffer,ALenum format,const offset /= 36; offset *= 65; offset *= Bytes; - length /= ALBuf->OriginalAlign; + length /= original_align; } else { @@ -2030,7 +2038,6 @@ static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei f ALBuf->OriginalChannels = SrcChannels; ALBuf->OriginalType = SrcType; ALBuf->OriginalSize = frames * 36 * OrigChannels; - ALBuf->OriginalAlign = 36 * OrigChannels; } } else @@ -2064,7 +2071,6 @@ static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei f ALBuf->OriginalChannels = SrcChannels; ALBuf->OriginalType = SrcType; ALBuf->OriginalSize = frames * OrigBytes * OrigChannels; - ALBuf->OriginalAlign = OrigBytes * OrigChannels; } } @@ -2073,7 +2079,6 @@ static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei f ALBuf->OriginalChannels = DstChannels; ALBuf->OriginalType = DstType; ALBuf->OriginalSize = frames * NewBytes * NewChannels; - ALBuf->OriginalAlign = NewBytes * NewChannels; } ALBuf->Frequency = freq; ALBuf->FmtChannels = DstChannels; |