mirror of https://github.com/ericonr/sndio.git
Merge branch 'master' into mixer
This commit is contained in:
commit
8653038e1d
32
sndiod/dev.c
32
sndiod/dev.c
|
@ -1582,6 +1582,7 @@ dev_mmcloc(struct dev *d, unsigned int origin)
|
||||||
void
|
void
|
||||||
slot_initconv(struct slot *s)
|
slot_initconv(struct slot *s)
|
||||||
{
|
{
|
||||||
|
unsigned int dev_nch;
|
||||||
struct dev *d = s->dev;
|
struct dev *d = s->dev;
|
||||||
|
|
||||||
if (s->mode & MODE_PLAY) {
|
if (s->mode & MODE_PLAY) {
|
||||||
|
@ -1599,17 +1600,23 @@ slot_initconv(struct slot *s)
|
||||||
}
|
}
|
||||||
s->mix.join = 1;
|
s->mix.join = 1;
|
||||||
s->mix.expand = 1;
|
s->mix.expand = 1;
|
||||||
if (s->opt->dup) {
|
if (s->opt->dup && s->mix.cmap.nch > 0) {
|
||||||
if (s->mix.cmap.nch > s->mix.nch)
|
dev_nch = d->pchan < (s->opt->pmax + 1) ?
|
||||||
s->mix.expand = s->mix.cmap.nch / s->mix.nch;
|
d->pchan - s->opt->pmin :
|
||||||
else if (s->mix.cmap.nch > 0)
|
s->opt->pmax - s->opt->pmin + 1;
|
||||||
s->mix.join = s->mix.nch / s->mix.cmap.nch;
|
if (dev_nch > s->mix.nch)
|
||||||
|
s->mix.expand = dev_nch / s->mix.nch;
|
||||||
|
else if (s->mix.nch > dev_nch)
|
||||||
|
s->mix.join = s->mix.nch / dev_nch;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (s->mode & MODE_RECMASK) {
|
if (s->mode & MODE_RECMASK) {
|
||||||
|
unsigned int outchan = (s->mode & MODE_MON) ?
|
||||||
|
d->pchan : d->rchan;
|
||||||
|
|
||||||
cmap_init(&s->sub.cmap,
|
cmap_init(&s->sub.cmap,
|
||||||
0, ((s->mode & MODE_MON) ? d->pchan : d->rchan) - 1,
|
0, outchan - 1,
|
||||||
s->opt->rmin, s->opt->rmax,
|
s->opt->rmin, s->opt->rmax,
|
||||||
s->opt->rmin, s->opt->rmin + s->sub.nch - 1,
|
s->opt->rmin, s->opt->rmin + s->sub.nch - 1,
|
||||||
s->opt->rmin, s->opt->rmin + s->sub.nch - 1);
|
s->opt->rmin, s->opt->rmin + s->sub.nch - 1);
|
||||||
|
@ -1622,11 +1629,14 @@ slot_initconv(struct slot *s)
|
||||||
}
|
}
|
||||||
s->sub.join = 1;
|
s->sub.join = 1;
|
||||||
s->sub.expand = 1;
|
s->sub.expand = 1;
|
||||||
if (s->opt->dup) {
|
if (s->opt->dup && s->sub.cmap.nch > 0) {
|
||||||
if (s->sub.cmap.nch > s->sub.nch)
|
dev_nch = outchan < (s->opt->rmax + 1) ?
|
||||||
s->sub.join = s->sub.cmap.nch / s->sub.nch;
|
outchan - s->opt->rmin :
|
||||||
else if (s->sub.cmap.nch > 0)
|
s->opt->rmax - s->opt->rmin + 1;
|
||||||
s->sub.expand = s->sub.nch / s->sub.cmap.nch;
|
if (dev_nch > s->sub.nch)
|
||||||
|
s->sub.join = dev_nch / s->sub.nch;
|
||||||
|
else if (s->sub.nch > dev_nch)
|
||||||
|
s->sub.expand = s->sub.nch / dev_nch;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue