summaryrefslogtreecommitdiff
path: root/lib/libossaudio/ossaudio.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libossaudio/ossaudio.c')
-rw-r--r--lib/libossaudio/ossaudio.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/lib/libossaudio/ossaudio.c b/lib/libossaudio/ossaudio.c
index f2e967db299..bb58068c067 100644
--- a/lib/libossaudio/ossaudio.c
+++ b/lib/libossaudio/ossaudio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ossaudio.c,v 1.2 1998/05/25 21:37:46 provos Exp $ */
+/* $OpenBSD: ossaudio.c,v 1.3 2001/05/24 04:21:03 aaron Exp $ */
/* $NetBSD: ossaudio.c,v 1.5 1998/03/23 00:39:18 augustss Exp $ */
/*
@@ -333,15 +333,27 @@ audio_ioctl(int fd, unsigned long com, void *argp)
INTARG = idat;
break;
case SNDCTL_DSP_GETOSPACE:
+ retval = ioctl(fd, AUDIO_GETINFO, &tmpinfo);
+ if (retval < 0)
+ return retval;
+ setblocksize(fd, &tmpinfo);
+ bufinfo.fragsize = tmpinfo.blocksize;
+ bufinfo.fragments = tmpinfo.hiwat -
+ (tmpinfo.play.seek + tmpinfo.blocksize - 1)/tmpinfo.blocksize;
+ bufinfo.fragstotal = tmpinfo.hiwat;
+ bufinfo.bytes = tmpinfo.hiwat * tmpinfo.blocksize - tmpinfo.play.seek;
+ *(struct audio_buf_info *)argp = bufinfo;
+ break;
case SNDCTL_DSP_GETISPACE:
retval = ioctl(fd, AUDIO_GETINFO, (caddr_t)&tmpinfo);
if (retval < 0)
return retval;
setblocksize(fd, &tmpinfo);
bufinfo.fragsize = tmpinfo.blocksize;
- bufinfo.fragments = /* XXX */
- bufinfo.fragstotal = tmpinfo.play.buffer_size / bufinfo.fragsize;
- bufinfo.bytes = tmpinfo.play.buffer_size;
+ bufinfo.fragments = tmpinfo.hiwat -
+ (tmpinfo.record.seek + tmpinfo.blocksize - 1)/tmpinfo.blocksize;
+ bufinfo.fragstotal = tmpinfo.hiwat;
+ bufinfo.bytes = tmpinfo.hiwat * tmpinfo.blocksize - tmpinfo.record.seek;
*(struct audio_buf_info *)argp = bufinfo;
break;
case SNDCTL_DSP_NONBLOCK: