qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-21 01:41:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix OSS sound. YAY!!!

Browse source 
Much thanks to Spirit from quaddicted for his patient help in testing, and
Spike for his heckling ;)
This commit is contained in:
Bill Currie 2012-01-06 21:21:45 +09:00
parent 03bcfb9483
commit a988c192ab
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -250,7 +250,8 @@ try_open (int rw)
return 0;
}
sn.frames = info.fragstotal;
sn.frames = info.fragstotal * info.fragsize;
sn.frames /= sn.channels * sn.samplebits / 8;
sn.submission_chunk = 1;
if (mmaped_io) { // memory map the dma buffer
@ -260,7 +261,8 @@ try_open (int rw)
len = (len + sz - 1) & ~(sz - 1);
sn.buffer = (byte *) mmap (NULL, len, mmmode, mmflags, audio_fd, 0);
if (sn.buffer == MAP_FAILED) {
Sys_Printf ("Could not mmap %s: %s\n", snd_dev, strerror (errno));
Sys_MaskPrintf (SYS_SND, "Could not mmap %s: %s\n", snd_dev,
strerror (errno));
close (audio_fd);
return 0;
}
@ -326,7 +328,7 @@ SNDDMA_GetDMAPos (void)
}
// sn.samplepos = (count.bytes / (sn.samplebits / 8)) & (sn.samples-1);
// fprintf(stderr, "%d \r", count.ptr);
sn.framepos = count.ptr / (sn.samplebits / 8);
sn.framepos = count.ptr / (sn.channels * sn.samplebits / 8);
return sn.framepos;