qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 12:52:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

this bit shouldn't know about windows

Browse source
This commit is contained in:
Bill Currie 2003-02-28 16:22:42 +00:00
parent 15cc02f17c
commit 7f37260a9c
2 changed files with 2 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libs/audio/renderer/snd_dma.c
View file

@ -427,12 +427,7 @@ SND_ClearBuffer (void)
int i; int i;
//#ifdef _WIN32
// if (!sound_started || !shm || (!shm->buffer && !pDSBuf))
//#endif
if (!sound_started || !shm || !shm->buffer) if (!sound_started || !shm || !shm->buffer)
//#endif
return; return;
if (shm->samplebits == 8) if (shm->samplebits == 8)
@ -440,13 +435,6 @@ SND_ClearBuffer (void)
else else
clear = 0; clear = 0;
#if 0
#ifdef _WIN32
if (pDSBuf)
DSOUND_ClearBuffer (clear);
else
#endif
#endif
for (i = 0; i < shm->samples * shm->samplebits / 8; i++) for (i = 0; i < shm->samples * shm->samplebits / 8; i++)
shm->buffer[i] = 0; shm->buffer[i] = 0;
} }
@ -592,13 +580,6 @@ SND_Update_ (void)
if (endtime - soundtime > samps) if (endtime - soundtime > samps)
endtime = soundtime + samps; endtime = soundtime + samps;
#if 0
#ifdef _WIN32
if (pDSBuf)
DSOUND_Restore ();
#endif
#endif
SND_PaintChannels (endtime); SND_PaintChannels (endtime);
snd_output_funcs->pS_O_Submit (); snd_output_funcs->pS_O_Submit ();
} }

43
libs/audio/renderer/snd_mix.c
View file

@ -93,20 +93,7 @@ SND_TransferStereo16 (int endtime)
lpaintedtime = paintedtime; lpaintedtime = paintedtime;
#if 0 pbuf = (unsigned long *) shm->buffer;
#ifdef _WIN32
if (pDSBuf) {
pbuf = DSOUND_LockBuffer (true);
if (!pbuf) {
Sys_Printf ("DSOUND_LockBuffer fails!\n");
return;
}
} else
#endif
#endif
{
pbuf = (unsigned long *) shm->buffer;
}
while (lpaintedtime < endtime) { while (lpaintedtime < endtime) {
// handle recirculating buffer issues // handle recirculating buffer issues
@ -126,13 +113,6 @@ SND_TransferStereo16 (int endtime)
snd_p += snd_linear_count; snd_p += snd_linear_count;
lpaintedtime += (snd_linear_count >> 1); lpaintedtime += (snd_linear_count >> 1);
} }
#if 0
#ifdef _WIN32
if (pDSBuf)
DSOUND_LockBuffer (false);
#endif
#endif
} }
static void static void
@ -154,20 +134,7 @@ SND_TransferPaintBuffer (int endtime)
step = 3 - shm->channels; step = 3 - shm->channels;
snd_vol = volume->value * 256; snd_vol = volume->value * 256;
#if 0 pbuf = (unsigned long *) shm->buffer;
#ifdef _WIN32
if (pDSBuf) {
pbuf = DSOUND_LockBuffer (true);
if (!pbuf) {
Sys_Printf ("DSOUND_LockBuffer fails!\n");
return;
}
} else
#endif
#endif
{
pbuf = (unsigned long *) shm->buffer;
}
if (shm->samplebits == 16) { if (shm->samplebits == 16) {
short *out = (short *) pbuf; short *out = (short *) pbuf;
@ -196,12 +163,6 @@ SND_TransferPaintBuffer (int endtime)
out_idx = (out_idx + 1) & out_mask; out_idx = (out_idx + 1) & out_mask;
} }
} }
#if 0
#ifdef _WIN32
if (pDSBuf)
DSOUND_LockBuffer (false);
#endif
#endif
} }
/* CHANNEL MIXING */ /* CHANNEL MIXING */