From 72c6c0a9b8a27a21cf76c83144ba1ed85cf922cc Mon Sep 17 00:00:00 2001 From: Alexandre Ratchov Date: Mon, 11 Jun 2018 19:53:09 +0200 Subject: [PATCH] sndiod: Use opt->dup and remove slot->dup. --- sndiod/dev.c | 5 ++--- sndiod/dev.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sndiod/dev.c b/sndiod/dev.c index b5dfc78..84d42dc 100644 --- a/sndiod/dev.c +++ b/sndiod/dev.c @@ -1431,7 +1431,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) @@ -1466,7 +1466,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) @@ -1685,7 +1685,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/sndiod/dev.h b/sndiod/dev.h index a5693a0..c0c4fff 100644 --- a/sndiod/dev.h +++ b/sndiod/dev.h @@ -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 */