=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sndiod/dev.c,v retrieving revision 1.37 retrieving revision 1.38 diff -c -r1.37 -r1.38 *** src/usr.bin/sndiod/dev.c 2018/06/26 07:15:17 1.37 --- src/usr.bin/sndiod/dev.c 2018/06/26 07:22:55 1.38 *************** *** 1,4 **** ! /* $OpenBSD: dev.c,v 1.37 2018/06/26 07:15:17 ratchov Exp $ */ /* * Copyright (c) 2008-2012 Alexandre Ratchov * --- 1,4 ---- ! /* $OpenBSD: dev.c,v 1.38 2018/06/26 07:22:55 ratchov Exp $ */ /* * Copyright (c) 2008-2012 Alexandre Ratchov * *************** *** 639,646 **** } weight /= n; } ! if (weight > i->mix.maxweight) ! weight = i->mix.maxweight; i->mix.weight = ADATA_MUL(weight, MIDI_TO_ADATA(d->master)); #ifdef DEBUG if (log_level >= 3) { --- 639,646 ---- } weight /= n; } ! if (weight > i->opt->maxweight) ! weight = i->opt->maxweight; i->mix.weight = ADATA_MUL(weight, MIDI_TO_ADATA(d->master)); #ifdef DEBUG if (log_level >= 3) { *************** *** 648,654 **** log_puts(": set weight: "); log_puti(i->mix.weight); log_puts("/"); ! log_puti(i->mix.maxweight); log_puts("\n"); } #endif --- 648,654 ---- log_puts(": set weight: "); log_puti(i->mix.weight); log_puts("/"); ! log_puti(i->opt->maxweight); log_puts("\n"); } #endif *************** *** 1684,1690 **** s->xrun = XRUN_IGNORE; s->tstate = MMC_OFF; } - s->mix.maxweight = s->opt->maxweight; s->dup = s->opt->dup; s->appbufsz = d->bufsz; s->round = d->round; --- 1684,1689 ----