summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Meuser <jakemsr@cvs.openbsd.org>2007-11-12 05:11:17 +0000
committerJacob Meuser <jakemsr@cvs.openbsd.org>2007-11-12 05:11:17 +0000
commitc8de32d0ca77a8a42d46aab20a4fd7f905443b66 (patch)
tree559eae0d232aba4d1ce41d6d139596eace6f6f7d
parentae8db8d6e985f20e1f2798ced2386a8f9f09c68d (diff)
implement SNDCTL_DSP_GETODELAY
bump minor version ok deanna@
-rw-r--r--lib/libossaudio/ossaudio.c7
-rw-r--r--lib/libossaudio/shlib_version2
-rw-r--r--lib/libossaudio/soundcard.h3
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/libossaudio/ossaudio.c b/lib/libossaudio/ossaudio.c
index 11349554454..06ffa1ba1f7 100644
--- a/lib/libossaudio/ossaudio.c
+++ b/lib/libossaudio/ossaudio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ossaudio.c,v 1.12 2007/11/06 04:24:39 jakemsr Exp $ */
+/* $OpenBSD: ossaudio.c,v 1.13 2007/11/12 05:11:16 jakemsr Exp $ */
/* $NetBSD: ossaudio.c,v 1.14 2001/05/10 01:53:48 augustss Exp $ */
/*-
@@ -98,6 +98,7 @@ audio_ioctl(int fd, unsigned long com, void *argp)
struct count_info cntinfo;
struct audio_encoding tmpenc;
struct audio_bufinfo tmpab;
+ u_long ldat;
u_int u;
int idat, idata;
int tempret, retval = 0, rerr = 0;
@@ -448,6 +449,10 @@ audio_ioctl(int fd, unsigned long com, void *argp)
retval = ioctl(fd, AUDIO_SETFD, &idat);
rerr = errno;
break;
+ case SNDCTL_DSP_GETODELAY:
+ retval = ioctl(fd, AUDIO_WSEEK, &ldat);
+ INTARG = (int)ldat;
+ break;
case SNDCTL_DSP_MAPINBUF:
case SNDCTL_DSP_MAPOUTBUF:
case SNDCTL_DSP_SETSYNCRO:
diff --git a/lib/libossaudio/shlib_version b/lib/libossaudio/shlib_version
index 012c14171d3..3f0196ebf4a 100644
--- a/lib/libossaudio/shlib_version
+++ b/lib/libossaudio/shlib_version
@@ -1,2 +1,2 @@
major=3
-minor=0
+minor=1
diff --git a/lib/libossaudio/soundcard.h b/lib/libossaudio/soundcard.h
index ce573a34366..c2f576b793b 100644
--- a/lib/libossaudio/soundcard.h
+++ b/lib/libossaudio/soundcard.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: soundcard.h,v 1.11 2005/12/19 16:16:19 millert Exp $ */
+/* $OpenBSD: soundcard.h,v 1.12 2007/11/12 05:11:16 jakemsr Exp $ */
/* $NetBSD: soundcard.h,v 1.11 2001/05/09 21:49:58 augustss Exp $ */
/*-
@@ -104,6 +104,7 @@
#define SNDCTL_DSP_SETSYNCRO _IO ('P', 21)
#define SNDCTL_DSP_SETDUPLEX _IO ('P', 22)
#define SNDCTL_DSP_PROFILE _IOW ('P', 23, int)
+#define SNDCTL_DSP_GETODELAY _IOR ('P', 24, int)
#define APF_NORMAL 0
#define APF_NETWORK 1
#define APF_CPUINTENS 2