diff options
author | Chris Robinson <[email protected]> | 2011-08-12 15:42:36 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2011-08-12 15:42:36 -0700 |
commit | 412cec73de3e127bbfba9f91c9586089217621df (patch) | |
tree | 42b6eac24a079727728add68800df5c7badcc07e /Alc/null.c | |
parent | a72c0f7470ff76c363810cfaf2a3fd6282cd8cc2 (diff) |
Avoid a temporary throw-away buffer for mixing null output
Diffstat (limited to 'Alc/null.c')
-rw-r--r-- | Alc/null.c | 20 |
1 files changed, 1 insertions, 19 deletions
@@ -27,9 +27,6 @@ typedef struct { - ALvoid *buffer; - ALuint size; - volatile int killNow; ALvoid *thread; } null_data; @@ -68,7 +65,7 @@ static ALuint NullProc(ALvoid *ptr) while(avail-done >= Device->UpdateSize) { - aluMixData(Device, data->buffer, Device->UpdateSize); + aluMixData(Device, NULL, Device->UpdateSize); done += Device->UpdateSize; } } @@ -104,23 +101,11 @@ static ALCboolean null_reset_playback(ALCdevice *device) { null_data *data = (null_data*)device->ExtraData; - data->size = device->UpdateSize * FrameSizeFromDevFmt(device->FmtChans, - device->FmtType); - data->buffer = malloc(data->size); - if(!data->buffer) - { - ERR("Buffer malloc failed\n"); - return ALC_FALSE; - } SetDefaultWFXChannelOrder(device); data->thread = StartThread(NullProc, device); if(data->thread == NULL) - { - free(data->buffer); - data->buffer = NULL; return ALC_FALSE; - } return ALC_TRUE; } @@ -137,9 +122,6 @@ static void null_stop_playback(ALCdevice *device) data->thread = NULL; data->killNow = 0; - - free(data->buffer); - data->buffer = NULL; } |