dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r3552) Remove the global variable _mixer

Browse Source
This commit is contained in:
tron
2006-02-05 09:56:04 +00:00
parent cf414c1864
commit 867e1acf08
6 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/cocoa_s.c
View File

@@ -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;
}

2
sound/sdl_s.c
View File

@@ -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)

2
sound/win32_s.c
View File

@@ -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");
}