From 412cec73de3e127bbfba9f91c9586089217621df Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Fri, 12 Aug 2011 15:42:36 -0700 Subject: Avoid a temporary throw-away buffer for mixing null output --- Alc/ALu.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'Alc/ALu.c') diff --git a/Alc/ALu.c b/Alc/ALu.c index 1ba71129..fd9b5334 100644 --- a/Alc/ALu.c +++ b/Alc/ALu.c @@ -1101,23 +1101,26 @@ ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size) } } - switch(device->FmtType) + if(buffer) { - case DevFmtByte: - Write_ALbyte(device, buffer, SamplesToDo); - break; - case DevFmtUByte: - Write_ALubyte(device, buffer, SamplesToDo); - break; - case DevFmtShort: - Write_ALshort(device, buffer, SamplesToDo); - break; - case DevFmtUShort: - Write_ALushort(device, buffer, SamplesToDo); - break; - case DevFmtFloat: - Write_ALfloat(device, buffer, SamplesToDo); - break; + switch(device->FmtType) + { + case DevFmtByte: + Write_ALbyte(device, buffer, SamplesToDo); + break; + case DevFmtUByte: + Write_ALubyte(device, buffer, SamplesToDo); + break; + case DevFmtShort: + Write_ALshort(device, buffer, SamplesToDo); + break; + case DevFmtUShort: + Write_ALushort(device, buffer, SamplesToDo); + break; + case DevFmtFloat: + Write_ALfloat(device, buffer, SamplesToDo); + break; + } } size -= SamplesToDo; -- cgit v1.2.3