qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

munmap the sound buffer when closing the device. This might help with some

Browse source 
hangs on shutdown.
This commit is contained in:
Bill Currie 2002-04-17 21:15:19 +00:00
parent 4cb89c69b2
commit e34ab5541c
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libs/audio/targets/snd_oss.c
View file

@ -224,6 +224,8 @@ SNDDMA_Init (void)
if (rc < 0) {
perror (snd_dev);
Sys_Printf ("Could not set %s to stereo=%d", snd_dev, shm->channels);
if (mmaped_io)
munmap (shm->buffer, shm->samples * shm->samplebits / 8);
close (audio_fd);
return 0;
}
@ -237,6 +239,8 @@ SNDDMA_Init (void)
if (rc < 0) {
perror (snd_dev);
Sys_Printf ("Could not set %s speed to %d", snd_dev, shm->speed);
if (mmaped_io)
munmap (shm->buffer, shm->samples * shm->samplebits / 8);
close (audio_fd);
return 0;
}
@ -247,6 +251,8 @@ SNDDMA_Init (void)
if (rc < 0) {
perror (snd_dev);
Sys_Printf ("Could not support 16-bit data. Try 8-bit.\n");
if (mmaped_io)
munmap (shm->buffer, shm->samples * shm->samplebits / 8);
close (audio_fd);
return 0;
}
@ -256,12 +262,16 @@ SNDDMA_Init (void)
if (rc < 0) {
perror (snd_dev);
Sys_Printf ("Could not support 8-bit data.\n");
if (mmaped_io)
munmap (shm->buffer, shm->samples * shm->samplebits / 8);
close (audio_fd);
return 0;
}
} else {
perror (snd_dev);
Sys_Printf ("%d-bit sound not supported.", shm->samplebits);
if (mmaped_io)
munmap (shm->buffer, shm->samples * shm->samplebits / 8);
close (audio_fd);
return 0;
}
@ -272,6 +282,8 @@ SNDDMA_Init (void)
if (rc < 0) {
perror (snd_dev);
Sys_Printf ("Could not toggle.\n");
if (mmaped_io)
munmap (shm->buffer, shm->samples * shm->samplebits / 8);
close (audio_fd);
return 0;
}
@ -280,6 +292,8 @@ SNDDMA_Init (void)
if (rc < 0) {
perror (snd_dev);
Sys_Printf ("Could not toggle.\n");
if (mmaped_io)
munmap (shm->buffer, shm->samples * shm->samplebits / 8);
close (audio_fd);
return 0;
}
@ -301,6 +315,8 @@ SNDDMA_GetDMAPos (void)
if (ioctl (audio_fd, SNDCTL_DSP_GETOPTR, &count) == -1) {
perror (snd_dev);
Sys_Printf ("Uh, sound dead.\n");
if (mmaped_io)
munmap (shm->buffer, shm->samples * shm->samplebits / 8);
close (audio_fd);
snd_inited = 0;
return 0;
@ -317,6 +333,8 @@ static void
SNDDMA_Shutdown (void)
{
if (snd_inited) {
if (mmaped_io)
munmap (shm->buffer, shm->samples * shm->samplebits / 8);
close (audio_fd);
snd_inited = 0;
}