diff options
| -rw-r--r-- | usr.bin/sndiod/dev.c | 7 | ||||
| -rw-r--r-- | usr.bin/sndiod/dev.h | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/sndiod/dev.c b/usr.bin/sndiod/dev.c index 050171f4483..8e558a289d4 100644 --- a/usr.bin/sndiod/dev.c +++ b/usr.bin/sndiod/dev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev.c,v 1.38 2018/06/26 07:22:55 ratchov Exp $ */ +/* $OpenBSD: dev.c,v 1.39 2018/06/26 07:27:44 ratchov Exp $ */ /* * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org> * @@ -1430,7 +1430,7 @@ slot_allocbufs(struct slot *s) s->mix.resampbuf = NULL; s->mix.join = 1; s->mix.expand = 1; - if (s->dup) { + if (s->opt->dup) { if (dev_nch > slot_nch) s->mix.expand = dev_nch / slot_nch; else if (dev_nch < slot_nch) @@ -1465,7 +1465,7 @@ slot_allocbufs(struct slot *s) s->sub.resampbuf = NULL; s->sub.join = 1; s->sub.expand = 1; - if (s->dup) { + if (s->opt->dup) { if (dev_nch > slot_nch) s->sub.join = dev_nch / slot_nch; else if (dev_nch < slot_nch) @@ -1684,7 +1684,6 @@ found: s->xrun = XRUN_IGNORE; s->tstate = MMC_OFF; } - s->dup = s->opt->dup; s->appbufsz = d->bufsz; s->round = d->round; s->rate = d->rate; diff --git a/usr.bin/sndiod/dev.h b/usr.bin/sndiod/dev.h index 126cfcfd1a5..7d112fdcf17 100644 --- a/usr.bin/sndiod/dev.h +++ b/usr.bin/sndiod/dev.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dev.h,v 1.15 2018/06/26 07:22:55 ratchov Exp $ */ +/* $OpenBSD: dev.h,v 1.16 2018/06/26 07:27:44 ratchov Exp $ */ /* * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org> * @@ -71,7 +71,6 @@ struct slot { } sub; int xrun; /* underrun policy */ int skip; /* cycles to skip (for xrun) */ - int dup; /* mono-to-stereo and alike */ #define SLOT_BUFSZ(s) \ ((s)->appbufsz + (s)->dev->bufsz / (s)->dev->round * (s)->round) int appbufsz; /* slot-side buffer size */ |