encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patched to compile on C89 compilers.

This commit is contained in:
Ryan C. Gordon 2016-11-05 03:53:59 -04:00
parent f3456e9a93
commit 067f0c8482
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/audio/SDL_audiocvt.c
View File

@ -258,7 +258,10 @@ SDL_BuildAudioTypeCVTToFloat(SDL_AudioCVT *cvt, const SDL_AudioFormat src_fmt)
} }
if (!SDL_AUDIO_ISFLOAT(src_fmt)) { if (!SDL_AUDIO_ISFLOAT(src_fmt)) {
const Uint16 src_bitsize = SDL_AUDIO_BITSIZE(src_fmt);
const Uint16 dst_bitsize = 32;
SDL_AudioFilter filter = NULL; SDL_AudioFilter filter = NULL;
switch (src_fmt & ~SDL_AUDIO_MASK_ENDIAN) { switch (src_fmt & ~SDL_AUDIO_MASK_ENDIAN) {
case AUDIO_S8: filter = SDL_Convert_S8_to_F32; break; case AUDIO_S8: filter = SDL_Convert_S8_to_F32; break;
case AUDIO_U8: filter = SDL_Convert_U8_to_F32; break; case AUDIO_U8: filter = SDL_Convert_U8_to_F32; break;
@ -271,8 +274,6 @@ SDL_BuildAudioTypeCVTToFloat(SDL_AudioCVT *cvt, const SDL_AudioFormat src_fmt)
return SDL_SetError("No conversion available for these formats"); return SDL_SetError("No conversion available for these formats");
} }
const Uint16 src_bitsize = SDL_AUDIO_BITSIZE(src_fmt);
const Uint16 dst_bitsize = 32;
cvt->filters[cvt->filter_index++] = filter; cvt->filters[cvt->filter_index++] = filter;
if (src_bitsize < dst_bitsize) { if (src_bitsize < dst_bitsize) {
const int mult = (dst_bitsize / src_bitsize); const int mult = (dst_bitsize / src_bitsize);
@ -281,6 +282,7 @@ SDL_BuildAudioTypeCVTToFloat(SDL_AudioCVT *cvt, const SDL_AudioFormat src_fmt)
} else if (src_bitsize > dst_bitsize) { } else if (src_bitsize > dst_bitsize) {
cvt->len_ratio /= (src_bitsize / dst_bitsize); cvt->len_ratio /= (src_bitsize / dst_bitsize);
} }
retval = 1; /* added a converter. */ retval = 1; /* added a converter. */
} }