Skip to content

Commit

Permalink
mixer.c (Mix_QuickLoad_WAV): replace memcmp() with SDL_memcmp().
Browse files Browse the repository at this point in the history
  • Loading branch information
Wohlstand committed Oct 29, 2020
1 parent cfd2e2f commit d11fe1a
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/mixer.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ mix_channels(void *udata, Uint8 *stream, int len)
Uint32 ticks = sdl_ticks - mix_channel[i].ticks_fade;
if (ticks >= mix_channel[i].fade_length) {
Mix_Volume(i, mix_channel[i].fade_volume_reset); /* Restore the volume */
if(mix_channel[i].fading == MIX_FADING_OUT) {
if (mix_channel[i].fading == MIX_FADING_OUT) {
mix_channel[i].playing = 0;
mix_channel[i].looping = 0;
mix_channel[i].expire = 0;
Expand Down Expand Up @@ -835,7 +835,7 @@ Mix_Chunk * SDLCALLCC Mix_QuickLoad_WAV(Uint8 *mem)
mem += 4;
chunk->abuf = mem;
mem += chunk->alen;
} while (memcmp(magic, "data", 4) != 0);
} while (SDL_memcmp(magic, "data", 4) != 0);
chunk->volume = MIX_MAX_VOLUME;

return(chunk);
Expand Down Expand Up @@ -1178,7 +1178,7 @@ int SDLCALLCC Mix_HaltChannel(int which)
mix_channel[which].looping = 0;
}
mix_channel[which].expire = 0;
if(mix_channel[which].fading != MIX_NO_FADING) /* Restore volume */
if (mix_channel[which].fading != MIX_NO_FADING) /* Restore volume */
mix_channel[which].volume = mix_channel[which].fade_volume_reset;
mix_channel[which].fading = MIX_NO_FADING;
Mix_UnlockAudio();
Expand All @@ -1192,7 +1192,7 @@ int SDLCALLCC Mix_HaltGroup(int tag)
int i;

for (i=0; i<num_channels; ++i) {
if(mix_channel[i].tag == tag) {
if (mix_channel[i].tag == tag) {
Mix_HaltChannel(i);
}
}
Expand Down Expand Up @@ -1242,7 +1242,7 @@ int SDLCALLCC Mix_FadeOutGroup(int tag, int ms)
int i;
int status = 0;
for (i=0; i<num_channels; ++i) {
if(mix_channel[i].tag == tag) {
if (mix_channel[i].tag == tag) {
status += Mix_FadeOutChannel(i,ms);
}
}
Expand Down Expand Up @@ -1368,14 +1368,14 @@ void SDLCALLCC Mix_Resume(int which)

for (i=0; i<num_channels; ++i) {
if (mix_channel[i].playing > 0) {
if(mix_channel[i].expire > 0)
if (mix_channel[i].expire > 0)
mix_channel[i].expire += sdl_ticks - mix_channel[i].paused;
mix_channel[i].paused = 0;
}
}
} else if (which < num_channels) {
if (mix_channel[which].playing > 0) {
if(mix_channel[which].expire > 0)
if (mix_channel[which].expire > 0)
mix_channel[which].expire += sdl_ticks - mix_channel[which].paused;
mix_channel[which].paused = 0;
}
Expand Down

0 comments on commit d11fe1a

Please sign in to comment.