X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_win.c;h=835063791b2c3ebe4076c303038ecd828fb76734;hp=b8d5175399dfc1c2f1e8cc207bbd45426b93e661;hb=b67992ec537cf235e37837191a6275f0d3630724;hpb=c4ddb9412fdc65efb2e47807baedf7a25234f891 diff --git a/snd_win.c b/snd_win.c index b8d51753..83506379 100644 --- a/snd_win.c +++ b/snd_win.c @@ -18,7 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "quakedef.h" -#include "winquake.h" +#include +#include + +extern HWND mainwindow; #define iDirectSoundCreate(a,b,c) pDirectSoundCreate(a,b,c) @@ -367,7 +370,7 @@ sndinitstat SNDDMA_InitDirect (void) // initialize the buffer reps = 0; - while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &lpData, &dwSize, NULL, NULL, 0)) != DS_OK) + while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, (LPVOID*)&lpData, &dwSize, NULL, NULL, 0)) != DS_OK) { if (hresult != DSERR_BUFFERLOST) { @@ -671,9 +674,7 @@ void SNDDMA_Submit(void) { if ( snd_completed == snd_sent ) { -#ifndef AKVERSION Con_DPrintf ("Sound overrun\n"); -#endif break; } @@ -734,7 +735,7 @@ void *S_LockBuffer(void) { reps = 0; - while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &dsound_pbuf, &dsound_dwSize, &dsound_pbuf2, &dsound_dwSize2, 0)) != DS_OK) + while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, (LPVOID*)&dsound_pbuf, &dsound_dwSize, (LPVOID*)&dsound_pbuf2, &dsound_dwSize2, 0)) != DS_OK) { if (hresult != DSERR_BUFFERLOST) {