Use SDL_ prefixed versions of C library functions.
FIXME: Change #include <stdlib.h> to #include "SDL_stdlib.h" Change #include <string.h> to #include "SDL_string.h" Make sure nothing else broke because of this... --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401340
This commit is contained in:
parent
00f6d8e5e3
commit
5d53175e4d
212 changed files with 1840 additions and 1884 deletions
|
@ -93,8 +93,8 @@ static int Audio_Available(void)
|
|||
|
||||
static void Audio_DeleteDevice(SDL_AudioDevice *device)
|
||||
{
|
||||
free(device->hidden);
|
||||
free(device);
|
||||
SDL_free(device->hidden);
|
||||
SDL_free(device);
|
||||
}
|
||||
|
||||
static SDL_AudioDevice *Audio_CreateDevice(int devindex)
|
||||
|
@ -102,20 +102,20 @@ static SDL_AudioDevice *Audio_CreateDevice(int devindex)
|
|||
SDL_AudioDevice *this;
|
||||
|
||||
/* Initialize all variables that we clean on shutdown */
|
||||
this = (SDL_AudioDevice *)malloc(sizeof(SDL_AudioDevice));
|
||||
this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice));
|
||||
if ( this ) {
|
||||
memset(this, 0, (sizeof *this));
|
||||
SDL_memset(this, 0, (sizeof *this));
|
||||
this->hidden = (struct SDL_PrivateAudioData *)
|
||||
malloc((sizeof *this->hidden));
|
||||
SDL_malloc((sizeof *this->hidden));
|
||||
}
|
||||
if ( (this == NULL) || (this->hidden == NULL) ) {
|
||||
SDL_OutOfMemory();
|
||||
if ( this ) {
|
||||
free(this);
|
||||
SDL_free(this);
|
||||
}
|
||||
return(0);
|
||||
}
|
||||
memset(this->hidden, 0, (sizeof *this->hidden));
|
||||
SDL_memset(this->hidden, 0, (sizeof *this->hidden));
|
||||
audio_fd = -1;
|
||||
|
||||
/* Set the function pointers */
|
||||
|
@ -428,11 +428,11 @@ static int DMA_OpenAudio(_THIS, SDL_AudioSpec *spec)
|
|||
dma_buf = NULL;
|
||||
return(-1);
|
||||
}
|
||||
memset(dma_buf, spec->silence, dma_len);
|
||||
SDL_memset(dma_buf, spec->silence, dma_len);
|
||||
|
||||
/* Check to see if we need to use select() workaround */
|
||||
{ char *workaround;
|
||||
workaround = getenv("SDL_DSP_NOSELECT");
|
||||
workaround = SDL_getenv("SDL_DSP_NOSELECT");
|
||||
if ( workaround ) {
|
||||
frame_ticks = (float)(spec->samples*1000)/spec->freq;
|
||||
next_frame = SDL_GetTicks()+frame_ticks;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue