X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsound.c;h=c1334cc7bb05381cada4ab00d9b26452cb13964d;hb=6fabe8481850a07a3d0bccacefe8c8fe60299f11;hp=9bdd2be8745c027f07aebe83b3694bd2b0bf7db9;hpb=3fb9d9cf97f3d4da6066f3c6b2ce84c81b768982;p=rocksndiamonds.git diff --git a/src/game_em/sound.c b/src/game_em/sound.c index 9bdd2be8..c1334cc7 100644 --- a/src/game_em/sound.c +++ b/src/game_em/sound.c @@ -20,9 +20,6 @@ #include #endif -#include "global.h" -#include "sample.h" - static char audioname[] = "/dev/audio"; static const int sound_priority[SAMPLE_MAX] = @@ -89,7 +86,7 @@ int sound_thread(void) mix_buffer = 0; mix_count = 0; - memset(sound_play, 0, sizeof(sound_play)); /* not playing any sounds */ + clear_mem(sound_play, sizeof(sound_play)); /* not playing any sounds */ for (;;) { @@ -297,7 +294,7 @@ int sound_thread(void) if (mix_count && audio_fd != -1) { /* prepare mix buffer */ - memset(mix_buffer, 0, fragment_size * sizeof(*mix_buffer)); + clear_mem(mix_buffer, fragment_size * sizeof(*mix_buffer)); for (i = 0; i < mix_count; i++) {