From 661cd176209151e883ddbfbb3dc135ecaea59f30 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 5 Jul 2012 12:16:44 -0400 Subject: [PATCH] Removed unneeded audio buffer memset() for consistent behavior on all platforms. --- src/audio/baudio/SDL_beaudio.cc | 3 --- src/audio/coreaudio/SDL_coreaudio.c | 6 ++---- src/audio/qsa/SDL_qsa_audio.c | 2 +- src/audio/winmm/SDL_winmm.c | 2 +- src/audio/xaudio2/SDL_xaudio2.c | 2 +- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/audio/baudio/SDL_beaudio.cc b/src/audio/baudio/SDL_beaudio.cc index 8540ea878..4c1eec5ea 100755 --- a/src/audio/baudio/SDL_beaudio.cc +++ b/src/audio/baudio/SDL_beaudio.cc @@ -48,9 +48,6 @@ FillSound(void *device, void *stream, size_t len, { SDL_AudioDevice *audio = (SDL_AudioDevice *) device; - /* Silence the buffer, since it's ours */ - SDL_memset(stream, audio->spec.silence, len); - /* Only do soemthing if audio is enabled */ if (!audio->enabled) return; diff --git a/src/audio/coreaudio/SDL_coreaudio.c b/src/audio/coreaudio/SDL_coreaudio.c index 53d3a08f1..9a5562184 100755 --- a/src/audio/coreaudio/SDL_coreaudio.c +++ b/src/audio/coreaudio/SDL_coreaudio.c @@ -280,8 +280,6 @@ outputCallback(void *inRefCon, while (remaining > 0) { if (this->hidden->bufferOffset >= this->hidden->bufferSize) { /* Generate the data */ - SDL_memset(this->hidden->buffer, this->spec.silence, - this->hidden->bufferSize); SDL_mutexP(this->mixer_lock); (*this->spec.callback)(this->spec.userdata, this->hidden->buffer, this->hidden->bufferSize); @@ -336,7 +334,7 @@ COREAUDIO_CloseDevice(_THIS) result = AudioOutputUnitStop(this->hidden->audioUnit); /* Remove the input callback */ - SDL_memset(&callback, '\0', sizeof(AURenderCallbackStruct)); + SDL_memset(&callback, 0, sizeof(AURenderCallbackStruct)); result = AudioUnitSetProperty(this->hidden->audioUnit, kAudioUnitProperty_SetRenderCallback, scope, bus, &callback, @@ -431,7 +429,7 @@ prepare_audiounit(_THIS, const char *devname, int iscapture, CHECK_RESULT("AudioUnitSetProperty (kAudioUnitProperty_StreamFormat)"); /* Set the audio callback */ - SDL_memset(&callback, '\0', sizeof(AURenderCallbackStruct)); + SDL_memset(&callback, 0, sizeof(AURenderCallbackStruct)); callback.inputProc = ((iscapture) ? inputCallback : outputCallback); callback.inputProcRefCon = this; result = AudioUnitSetProperty(this->hidden->audioUnit, diff --git a/src/audio/qsa/SDL_qsa_audio.c b/src/audio/qsa/SDL_qsa_audio.c index e7d624d50..8b1e138f5 100755 --- a/src/audio/qsa/SDL_qsa_audio.c +++ b/src/audio/qsa/SDL_qsa_audio.c @@ -570,7 +570,7 @@ QSA_OpenDevice(_THIS, const char *devname, int iscapture) } /* Make sure channel is setup right one last time */ - SDL_memset(&csetup, '\0', sizeof(csetup)); + SDL_memset(&csetup, 0, sizeof(csetup)); if (!this->hidden->iscapture) { csetup.channel = SND_PCM_CHANNEL_PLAYBACK; } else { diff --git a/src/audio/winmm/SDL_winmm.c b/src/audio/winmm/SDL_winmm.c index 8df5843d0..284236bf0 100755 --- a/src/audio/winmm/SDL_winmm.c +++ b/src/audio/winmm/SDL_winmm.c @@ -369,7 +369,7 @@ WINMM_OpenDevice(_THIS, const char *devname, int iscapture) return 0; } for (i = 0; i < NUM_BUFFERS; ++i) { - SDL_memset(&this->hidden->wavebuf[i], '\0', + SDL_memset(&this->hidden->wavebuf[i], 0, sizeof(this->hidden->wavebuf[i])); this->hidden->wavebuf[i].dwBufferLength = this->spec.size; this->hidden->wavebuf[i].dwFlags = WHDR_DONE; diff --git a/src/audio/xaudio2/SDL_xaudio2.c b/src/audio/xaudio2/SDL_xaudio2.c index b3651827f..d42d89638 100755 --- a/src/audio/xaudio2/SDL_xaudio2.c +++ b/src/audio/xaudio2/SDL_xaudio2.c @@ -332,7 +332,7 @@ XAUDIO2_OpenDevice(_THIS, const char *devname, int iscapture) return 0; } this->hidden->nextbuf = this->hidden->mixbuf; - SDL_memset(this->hidden->mixbuf, '\0', 2 * this->hidden->mixlen); + SDL_memset(this->hidden->mixbuf, 0, 2 * this->hidden->mixlen); /* We use XAUDIO2_DEFAULT_CHANNELS instead of this->spec.channels. On Xbox360, this means 5.1 output, but on Windows, it means "figure out