qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-05-30 08:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Win32 sound cleanups - phase1

Browse source
This commit is contained in:
Dabb 2000-12-29 15:20:12 +00:00
parent 48f6a02a38
commit 477bcf51b0
4 changed files with 90 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

52
source/snd_dma.c
View file

@ -38,11 +38,6 @@
#include "sys.h"
#include "sound.h"
// fixme: Damn crappy complier doesn't allow me to UNDEF _win32 on command line!
#ifdef WIN32SDL
#undef _WIN32
#endif
#ifdef _WIN32
#include "winquake.h"
#include "in_win.h"
@ -620,35 +615,8 @@ S_ClearBuffer (void)
clear = 0;
#ifdef _WIN32
if (pDSBuf) {
DWORD dwSize;
DWORD *pData;
int reps;
HRESULT hresult;
reps = 0;
while ((hresult = pDSBuf->lpVtbl->Lock (pDSBuf, 0, gSndBufSize,
(LPVOID *) & pData, &dwSize,
NULL, NULL, 0)) != DS_OK) {
if (hresult != DSERR_BUFFERLOST) {
Con_Printf ("S_ClearBuffer: DS::Lock Sound Buffer Failed\n");
S_Shutdown ();
return;
}
if (++reps > 10000) {
Con_Printf ("S_ClearBuffer: DS: couldn't restore buffer\n");
S_Shutdown ();
return;
}
}
memset (pData, clear, shm->samples * shm->samplebits / 8);
pDSBuf->lpVtbl->Unlock (pDSBuf, pData, dwSize, NULL, 0);
} else
if (pDSBuf) DSOUND_ClearBuffer(clear);
else
#endif
{
memset (shm->buffer, clear, shm->samples * shm->samplebits / 8);
@ -909,21 +877,7 @@ S_Update_ (void)
endtime = soundtime + samps;
#ifdef _WIN32
// if the buffer was lost or stopped, restore it and/or restart it
{
DWORD dwStatus;
if (pDSBuf) {
if (pDSBuf->lpVtbl->GetStatus (pDSBuf, &dwStatus) != DD_OK)
Con_Printf ("Couldn't get sound buffer status\n");
if (dwStatus & DSBSTATUS_BUFFERLOST)
pDSBuf->lpVtbl->Restore (pDSBuf);
if (!(dwStatus & DSBSTATUS_PLAYING))
pDSBuf->lpVtbl->Play (pDSBuf, 0, 0, DSBPLAY_LOOPING);
}
}
if(pDSBuf) DSOUND_Restore();
#endif
S_PaintChannels (endtime);