pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Visual Studio compilation problems

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403179
This commit is contained in:
Sam Lantinga 2008-08-26 07:34:49 +00:00
parent a4af7a72fe
commit 5e73fc7c16
6 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/audio/SDL_audio.c
View file

@ -291,10 +291,8 @@ SDL_StreamLength(SDL_AudioStreamer * stream)
int
SDL_StreamInit(SDL_AudioStreamer * stream, int max_len, Uint8 silence)
{
int i;
/* First try to allocate the buffer */
stream->buffer = (Uint8 *) malloc(max_len);
stream->buffer = (Uint8 *) SDL_malloc(max_len);
if (stream->buffer == NULL) {
return -1;
}
@ -304,9 +302,9 @@ SDL_StreamInit(SDL_AudioStreamer * stream, int max_len, Uint8 silence)
stream->write_pos = 0;
/* Zero out the buffer */
for (i = 0; i < max_len; ++i) {
stream->buffer[i] = silence;
}
SDL_memset(stream->buffer, silence, max_len);
return 0;
}
/* Deinitialize the stream simply by freeing the buffer */
@ -314,7 +312,7 @@ void
SDL_StreamDeinit(SDL_AudioStreamer * stream)
{
if (stream->buffer != NULL) {
free(stream->buffer);
SDL_free(stream->buffer);
}
}

17
src/audio/SDL_audiocvt.c
View file

@ -20,6 +20,8 @@
slouken@libsdl.org
*/
#include "SDL_config.h"
#define _USE_MATH_DEFINES
#include <math.h>
/* Functions for audio drivers to perform runtime conversion of audio format */
@ -27,7 +29,7 @@
#include "SDL_audio.h"
#include "SDL_audio_c.h"
#define DEBUG_CONVERT
//#define DEBUG_CONVERT
/* These are fractional multiplication routines. That is, their inputs
are two numbers in the range [-1, 1) and the result falls in that
@ -1369,7 +1371,7 @@ SDL_BuildIIRLowpass(SDL_AudioCVT * cvt, SDL_AudioFormat format)
w0 = 2.0f * M_PI * fc;
cosw0 = cosf(w0);
alpha = sin(w0) / (2.0f * Q);
alpha = sinf(w0) / (2.0f * Q);
/* Compute coefficients, normalizing by a0 */
scale = 1.0f / (1.0f + alpha);
@ -1438,7 +1440,7 @@ SDL_BuildIIRLowpass(SDL_AudioCVT * cvt, SDL_AudioFormat format)
#endif
/* Initialize the state buffer to all zeroes, and set initial position */
memset(cvt->state_buf, 0, 4 * SDL_AUDIO_BITSIZE(format) / 4);
SDL_memset(cvt->state_buf, 0, 4 * SDL_AUDIO_BITSIZE(format) / 4);
cvt->state_pos = 0;
#undef convert_fixed
}
@ -1636,7 +1638,7 @@ SDL_BuildWindowedSinc(SDL_AudioCVT * cvt, SDL_AudioFormat format,
cvt->len_sinc = m + 1;
/* Allocate the floating point windowed sinc. */
fSinc = (float *) malloc((m + 1) * sizeof(float));
fSinc = SDL_stack_alloc(float, (m + 1));
if (fSinc == NULL) {
return -1;
}
@ -1699,16 +1701,17 @@ SDL_BuildWindowedSinc(SDL_AudioCVT * cvt, SDL_AudioFormat format,
}
/* Initialize the state buffer to all zeroes, and set initial position */
memset(cvt->state_buf, 0, cvt->len_sinc * SDL_AUDIO_BITSIZE(format) / 4);
SDL_memset(cvt->state_buf, 0,
cvt->len_sinc * SDL_AUDIO_BITSIZE(format) / 4);
cvt->state_pos = 0;
/* Clean up */
#undef convert_fixed
free(fSinc);
SDL_stack_free(fSinc);
}
/* This is used to reduce the resampling ratio */
inline int
static __inline__ int
SDL_GCD(int a, int b)
{
int temp;