ericonr
/
sndio
mirror of https://github.com/ericonr/sndio.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dev_mix_setmaster -> dev_mix_adjvol

This commit is contained in:
Alexandre Ratchov 2012-11-11 00:21:34 +01:00
parent 12a200c18a
commit 40174ce175
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sndiod/dev.c
View File

@ -641,7 +641,7 @@ dev_empty_cycle(struct dev *d)
* Normalize input levels. * Normalize input levels.
*/ */
void void
dev_mix_setmaster(struct dev *d) dev_mix_adjvol(struct dev *d)
{ {
unsigned int n; unsigned int n;
struct slot *i, *j; struct slot *i, *j;
@ -735,7 +735,7 @@ dev_mix_cycle(struct dev *d)
xfree(s->mix.resampbuf); xfree(s->mix.resampbuf);
s->ops->eof(s->arg); s->ops->eof(s->arg);
*ps = s->next; *ps = s->next;
dev_mix_setmaster(d); dev_mix_adjvol(d);
continue; continue;
} }
if (s->mix.buf.used < s->round * s->mix.bpf && if (s->mix.buf.used < s->round * s->mix.bpf &&
@ -941,7 +941,7 @@ dev_master(struct dev *d, unsigned int master)
} }
d->master = master; d->master = master;
if (d->mode & MODE_PLAY) if (d->mode & MODE_PLAY)
dev_mix_setmaster(d); dev_mix_adjvol(d);
} }
void void
@ -1749,7 +1749,7 @@ slot_attach(struct slot *s)
#endif #endif
s->mix.drop = 0; s->mix.drop = 0;
s->mix.vol = MIDI_TO_ADATA(s->vol); s->mix.vol = MIDI_TO_ADATA(s->vol);
dev_mix_setmaster(d); dev_mix_adjvol(d);
} }
if (s->mode & MODE_RECMASK) { if (s->mode & MODE_RECMASK) {
slot_nch = s->sub.slot_cmax - s->sub.slot_cmin + 1; slot_nch = s->sub.slot_cmax - s->sub.slot_cmin + 1;
@ -1921,7 +1921,7 @@ slot_detach(struct slot *s)
xfree(s->mix.decbuf); xfree(s->mix.decbuf);
if (s->mix.resampbuf) if (s->mix.resampbuf)
xfree(s->mix.resampbuf); xfree(s->mix.resampbuf);
dev_mix_setmaster(s->dev); dev_mix_adjvol(s->dev);
} }
} }