diff options
author | Chris Robinson <[email protected]> | 2007-12-05 00:29:20 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2007-12-05 00:29:20 -0800 |
commit | 15019b3871efa27782703ee216aa910927427801 (patch) | |
tree | dfa6c6e9fd677160b605fcf9ed91421ade76f41d /Alc/dsound.c | |
parent | 86cced248be365c3e7597deeab53d6c25636bc54 (diff) |
Allow aluMixData to accept a NULL context for silence
Diffstat (limited to 'Alc/dsound.c')
-rw-r--r-- | Alc/dsound.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/Alc/dsound.c b/Alc/dsound.c index 5d688567..5913f52f 100644 --- a/Alc/dsound.c +++ b/Alc/dsound.c @@ -87,18 +87,10 @@ static void CALLBACK DirectSoundProc(UINT uID,UINT uReserved,DWORD_PTR dwUser,DW { // If we have an active context, mix data directly into output buffer otherwise fill with silence SuspendContext(NULL); - if(pDevice->Context) - { - if (WritePtr1) - aluMixData(pDevice->Context, WritePtr1, WriteCnt1, pDevice->Format); - if (WritePtr2) - aluMixData(pDevice->Context, WritePtr2, WriteCnt2, pDevice->Format); - } - else - { - if (WritePtr1) memset(WritePtr1, 0, WriteCnt1); - if (WritePtr2) memset(WritePtr2, 0, WriteCnt2); - } + if (WritePtr1) + aluMixData(pDevice->Context, WritePtr1, WriteCnt1, pDevice->Format); + if (WritePtr2) + aluMixData(pDevice->Context, WritePtr2, WriteCnt2, pDevice->Format); ProcessContext(NULL); // Unlock output buffer only when successfully locked |