From 867e1acf084c5b789d8db964fe27b3ce396f213f Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 5 Feb 2006 09:56:04 +0000 Subject: (svn r3552) Remove the global variable _mixer --- sound/cocoa_s.c | 2 +- sound/sdl_s.c | 2 +- sound/win32_s.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sound') diff --git a/sound/cocoa_s.c b/sound/cocoa_s.c index 5104b6ccf..177bce973 100644 --- a/sound/cocoa_s.c +++ b/sound/cocoa_s.c @@ -42,7 +42,7 @@ static AudioUnit _outputAudioUnit; /* The CoreAudio callback */ static OSStatus audioCallback(void *inRefCon, AudioUnitRenderActionFlags inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, AudioBuffer *ioData) { - MxMixSamples(_mixer, ioData->mData, ioData->mDataByteSize / 4); + MxMixSamples(ioData->mData, ioData->mDataByteSize / 4); return noErr; } diff --git a/sound/sdl_s.c b/sound/sdl_s.c index 762be59b6..4b1da52d6 100644 --- a/sound/sdl_s.c +++ b/sound/sdl_s.c @@ -13,7 +13,7 @@ static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len) { - MxMixSamples(_mixer, stream, len / 4); + MxMixSamples(stream, len / 4); } static const char *SdlSoundStart(const char * const *parm) diff --git a/sound/win32_s.c b/sound/win32_s.c index 22c1b9468..a39cee985 100644 --- a/sound/win32_s.c +++ b/sound/win32_s.c @@ -29,7 +29,7 @@ static void FillHeaders(void) for (hdr = _wave_hdr; hdr != endof(_wave_hdr); hdr++) { if (!(hdr->dwFlags & WHDR_INQUEUE)) { - MxMixSamples(_mixer, hdr->lpData, hdr->dwBufferLength / 4); + MxMixSamples(hdr->lpData, hdr->dwBufferLength / 4); if (waveOutWrite(_waveout, hdr, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) error("waveOutWrite failed"); } -- cgit v1.2.3-54-g00ecf