# HG changeset patch # User Ryan C. Gordon # Date 1065772842 0 # Node ID 4d2febf33dc76389f67c9942b3debdb5634f654f # Parent 69c8ba97f4bd644919e1314d1b9168531d11a070 Changed some SDL_Error()s to __Sound_SetError() to fix linking issues. diff -r 69c8ba97f4bd -r 4d2febf33dc7 decoders/timidity/instrum_dls.c --- a/decoders/timidity/instrum_dls.c Sun Oct 05 23:33:11 2003 +0000 +++ b/decoders/timidity/instrum_dls.c Fri Oct 10 08:00:42 2003 +0000 @@ -66,7 +66,7 @@ { RIFF_Chunk *chunk = (RIFF_Chunk *)malloc(sizeof(*chunk)); if ( !chunk ) { - SDL_Error(SDL_ENOMEM); + __Sound_SetError(ERR_OUT_OF_MEMORY); return NULL; } memset(chunk, 0, sizeof(*chunk)); @@ -179,18 +179,18 @@ chunk->magic = SDL_ReadLE32(src); chunk->length = SDL_ReadLE32(src); if ( chunk->magic != RIFF ) { - SDL_SetError("Not a RIFF file"); + __Sound_SetError("Not a RIFF file"); FreeRIFFChunk(chunk); return NULL; } chunk->data = (Uint8 *)malloc(chunk->length); if ( chunk->data == NULL ) { - SDL_Error(SDL_ENOMEM); + __Sound_SetError(ERR_OUT_OF_MEMORY); FreeRIFFChunk(chunk); return NULL; } if ( SDL_RWread(src, chunk->data, chunk->length, 1) != 1 ) { - SDL_Error(SDL_EFREAD); + __Sound_SetError(ERR_IO_ERROR); FreeRIFF(chunk); return NULL; } @@ -738,7 +738,7 @@ RIFF_Chunk *chunk; DLS_Data *data = (DLS_Data *)malloc(sizeof(*data)); if ( !data ) { - SDL_Error(SDL_ENOMEM); + __Sound_SetError(ERR_OUT_OF_MEMORY); return NULL; } memset(data, 0, sizeof(*data));