music_mad.c
changeset 621 944412baab72
parent 617 87116a42526e
child 625 1d489d8ec2e0
     1.1 --- a/music_mad.c	Mon May 27 13:35:45 2013 -0700
     1.2 +++ b/music_mad.c	Sat Jun 01 10:11:20 2013 -0700
     1.3 @@ -117,7 +117,7 @@
     1.4  
     1.5          /* At the end of the file, we must stuff MAD_BUFFER_GUARD
     1.6             number of 0 bytes. */
     1.7 -        memset(read_start + read_size, 0, MAD_BUFFER_GUARD);
     1.8 +        SDL_memset(read_start + read_size, 0, MAD_BUFFER_GUARD);
     1.9          read_size += MAD_BUFFER_GUARD;
    1.10        }
    1.11      }
    1.12 @@ -223,7 +223,7 @@
    1.13  
    1.14    if ((mp3_mad->status & MS_playing) == 0) {
    1.15      /* We're not supposed to be playing, so send silence instead. */
    1.16 -    memset(stream, 0, len);
    1.17 +    SDL_memset(stream, 0, len);
    1.18      return 0;
    1.19    }
    1.20  
    1.21 @@ -238,7 +238,7 @@
    1.22          if ((mp3_mad->status & MS_error_flags) != 0) {
    1.23            /* Couldn't read a frame; either an error condition or
    1.24               end-of-file.  Stop. */
    1.25 -          memset(out, 0, bytes_remaining);
    1.26 +          SDL_memset(out, 0, bytes_remaining);
    1.27            mp3_mad->status &= ~MS_playing;
    1.28            return bytes_remaining;
    1.29          }
    1.30 @@ -262,7 +262,7 @@
    1.31      }
    1.32  
    1.33      if (mp3_mad->volume == MIX_MAX_VOLUME) {
    1.34 -      memcpy(out, mp3_mad->output_buffer + mp3_mad->output_begin, num_bytes);
    1.35 +      SDL_memcpy(out, mp3_mad->output_buffer + mp3_mad->output_begin, num_bytes);
    1.36      } else {
    1.37        SDL_MixAudio(out, mp3_mad->output_buffer + mp3_mad->output_begin,
    1.38                     num_bytes, mp3_mad->volume);