Mercurial > sdl-ios-xcode
diff src/audio/alsa/SDL_alsa_audio.c @ 1336:3692456e7b0f
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...
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Tue, 07 Feb 2006 06:59:48 +0000 |
| parents | 1cbaeee565b1 |
| children | 604d73db6802 |
line wrap: on
line diff
--- a/src/audio/alsa/SDL_alsa_audio.c Mon Feb 06 17:28:04 2006 +0000 +++ b/src/audio/alsa/SDL_alsa_audio.c Tue Feb 07 06:59:48 2006 +0000 @@ -170,7 +170,7 @@ { const char *device; - device = getenv("AUDIODEV"); /* Is there a standard variable name? */ + device = SDL_getenv("AUDIODEV"); /* Is there a standard variable name? */ if ( device == NULL ) { if (channels == 6) device = "surround51"; else if (channels == 4) device = "surround40"; @@ -202,8 +202,8 @@ static void Audio_DeleteDevice(SDL_AudioDevice *device) { - free(device->hidden); - free(device); + SDL_free(device->hidden); + SDL_free(device); UnloadALSALibrary(); } @@ -213,20 +213,20 @@ /* Initialize all variables that we clean on shutdown */ LoadALSALibrary(); - 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)); /* Set the function pointers */ this->OpenAudio = ALSA_OpenAudio; @@ -435,7 +435,7 @@ ALSA_CloseAudio(this); return(-1); } - memset(mixbuf, spec->silence, spec->size); + SDL_memset(mixbuf, spec->silence, spec->size); /* Get the parent process id (we're the parent of the audio thread) */ parent = getpid();