qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-22 04:01:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

backport my sdl audio fixes

Browse source
This commit is contained in:
Adam Olsen 2001-05-14 22:53:17 +00:00
parent 978d90f9f7
commit d1f33ed6a6
1 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
source/snd_sdl.c
View file

@ -43,6 +43,7 @@
#include "console.h" #include "console.h"
#include "qargs.h" #include "qargs.h"
#include "sound.h" #include "sound.h"
#include "sys.h"
static dma_t the_shm; static dma_t the_shm;
static int snd_inited; static int snd_inited;
@ -53,11 +54,27 @@ extern int desired_bits;
static void static void
paint_audio (void *unused, Uint8 * stream, int len) paint_audio (void *unused, Uint8 * stream, int len)
{ {
int streamsamples;
int sampleposbytes;
int samplesbytes;
if (shm) { if (shm) {
shm->buffer = stream; streamsamples = len / (shm->samplebits / 8);
shm->samplepos += len / (shm->samplebits / 8); sampleposbytes = shm->samplepos * (shm->samplebits / 8);
// Check for samplepos overflow? samplesbytes = shm->samples * (shm->samplebits / 8);
S_PaintChannels (shm->samplepos);
shm->samplepos += streamsamples;
while (shm->samplepos >= shm->samples)
shm->samplepos -= shm->samples;
S_PaintChannels (soundtime + streamsamples);
if (shm->samplepos + streamsamples <= shm->samples)
memcpy (stream, shm->buffer + sampleposbytes, len);
else {
memcpy (stream, shm->buffer + sampleposbytes, samplesbytes - sampleposbytes);
memcpy (stream + samplesbytes - sampleposbytes, shm->buffer, len - (samplesbytes - sampleposbytes));
}
soundtime += streamsamples;
} }
} }
@ -85,7 +102,7 @@ SNDDMA_Init (void)
return 0; return 0;
} }
desired.channels = 2; desired.channels = 2;
desired.samples = 512; desired.samples = 1024;
desired.callback = paint_audio; desired.callback = paint_audio;
/* Open the audio device */ /* Open the audio device */
@ -119,6 +136,7 @@ SNDDMA_Init (void)
memcpy (&obtained, &desired, sizeof (desired)); memcpy (&obtained, &desired, sizeof (desired));
break; break;
} }
SDL_LockAudio();
SDL_PauseAudio (0); SDL_PauseAudio (0);
/* Fill the audio DMA information block */ /* Fill the audio DMA information block */
@ -127,10 +145,14 @@ SNDDMA_Init (void)
shm->samplebits = (obtained.format & 0xFF); shm->samplebits = (obtained.format & 0xFF);
shm->speed = obtained.freq; shm->speed = obtained.freq;
shm->channels = obtained.channels; shm->channels = obtained.channels;
shm->samples = obtained.samples * shm->channels; shm->samples = obtained.samples * 16;
shm->samplepos = 0; shm->samplepos = 0;
shm->submission_chunk = 1; shm->submission_chunk = 1;
shm->buffer = NULL; shm->buffer = calloc(shm->samples * (shm->samplebits / 8), 1);
if (!shm->buffer)
{
Sys_Error ("Failed to allocate buffer for sound!\n");
}
snd_inited = 1; snd_inited = 1;
return 1; return 1;
@ -146,8 +168,11 @@ void
SNDDMA_Shutdown (void) SNDDMA_Shutdown (void)
{ {
if (snd_inited) { if (snd_inited) {
SDL_PauseAudio (1);
SDL_UnlockAudio ();
SDL_CloseAudio (); SDL_CloseAudio ();
snd_inited = 0; snd_inited = 0;
shm = NULL;
} }
} }
@ -161,4 +186,6 @@ SNDDMA_Shutdown (void)
void void
SNDDMA_Submit (void) SNDDMA_Submit (void)
{ {
SDL_UnlockAudio();
SDL_LockAudio();
} }