diff options
| author | Alexandre Ratchov <ratchov@cvs.openbsd.org> | 2015-07-28 20:51:11 +0000 |
|---|---|---|
| committer | Alexandre Ratchov <ratchov@cvs.openbsd.org> | 2015-07-28 20:51:11 +0000 |
| commit | e4bc51d0345ab16708f689c5c2dcff4ce697e17a (patch) | |
| tree | e49c66a5288290f765b6be6d160a9c430e7f8304 | |
| parent | 774aba15775e05dba08adfb19580aab87a725cea (diff) | |
Use new AUDIO_GETPOS ioctl() to ensure "bytes" and "errors" counters
are consistent.
| -rw-r--r-- | usr.bin/audioctl/audioctl.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/usr.bin/audioctl/audioctl.c b/usr.bin/audioctl/audioctl.c index abc4c5010e1..2e0deadd7c4 100644 --- a/usr.bin/audioctl/audioctl.c +++ b/usr.bin/audioctl/audioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: audioctl.c,v 1.28 2015/05/26 18:17:12 ratchov Exp $ */ +/* $OpenBSD: audioctl.c,v 1.29 2015/07/28 20:51:10 ratchov Exp $ */ /* $NetBSD: audioctl.c,v 1.14 1998/04/27 16:55:23 augustss Exp $ */ /* @@ -59,9 +59,9 @@ audio_info_t info; char encbuf[1000]; -int properties, fullduplex, perrors, rerrors; +int properties, fullduplex; -struct audio_offset poffs, roffs; +struct audio_pos getpos; struct field { const char *name; @@ -97,8 +97,8 @@ struct field { { "play.pause", &info.play.pause, UCHAR, 0 }, { "play.active", &info.play.active, UCHAR, READONLY }, { "play.block_size", &info.play.block_size, UINT, 0 }, - { "play.bytes", &poffs.samples, INT, READONLY }, - { "play.errors", &perrors, INT, READONLY }, + { "play.bytes", &getpos.play_pos, UINT, READONLY }, + { "play.errors", &getpos.play_xrun, UINT, READONLY }, { "record.rate", &info.record.sample_rate,UINT, 0 }, { "record.sample_rate", &info.record.sample_rate,UINT, ALIAS }, { "record.channels", &info.record.channels, UINT, 0 }, @@ -109,8 +109,8 @@ struct field { { "record.pause", &info.record.pause, UCHAR, 0 }, { "record.active", &info.record.active, UCHAR, READONLY }, { "record.block_size", &info.record.block_size,UINT, 0 }, - { "record.bytes", &roffs.samples, INT, READONLY }, - { "record.errors", &rerrors, INT, READONLY }, + { "record.bytes", &getpos.rec_pos, UINT, READONLY }, + { "record.errors", &getpos.rec_xrun, UINT, READONLY }, { 0 } }; @@ -297,16 +297,12 @@ getinfo(int fd) err(1, "AUDIO_GETFD"); if (ioctl(fd, AUDIO_GETPROPS, &properties) < 0) err(1, "AUDIO_GETPROPS"); - if (ioctl(fd, AUDIO_PERROR, &perrors) < 0) - err(1, "AUDIO_PERROR"); - if (ioctl(fd, AUDIO_RERROR, &rerrors) < 0) - err(1, "AUDIO_RERROR"); - if (ioctl(fd, AUDIO_GETOOFFS, &poffs) < 0) - err(1, "AUDIO_GETOOFFS"); - if (ioctl(fd, AUDIO_GETIOFFS, &roffs) < 0) - err(1, "AUDIO_GETOIFFS"); + if (ioctl(fd, AUDIO_GETPROPS, &properties) < 0) + err(1, "AUDIO_GETPROPS"); if (ioctl(fd, AUDIO_GETINFO, &info) < 0) err(1, "AUDIO_GETINFO"); + if (ioctl(fd, AUDIO_GETPOS, &getpos) < 0) + err(1, "AUDIO_GETPOS"); } void |