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

factor tests for f->opt->join flag, no behaviour change

This commit is contained in:
Alexandre Ratchov 2011-06-03 18:47:34 +02:00
parent 489fe436c3
commit 0778d29b61
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
aucat/sock.c
View File

@ -530,6 +530,7 @@ void
sock_attach(struct sock *f, int force)
{
struct abuf *rbuf, *wbuf;
unsigned rch, wch;
rbuf = LIST_FIRST(&f->pipe.file.rproc->outs);
wbuf = LIST_FIRST(&f->pipe.file.wproc->ins);
@ -567,11 +568,13 @@ sock_attach(struct sock *f, int force)
* because dev_xxx() functions are supposed to
* work (i.e., not to crash)
*/
if (f->opt->join) {
rch = f->opt->rpar.cmax - f->opt->rpar.cmin + 1;
wch = f->opt->wpar.cmax - f->opt->wpar.cmin + 1;
} else
rch = wch = 0;
dev_attach(f->dev, f->pipe.file.name, f->mode,
rbuf, &f->rpar,
f->opt->join ? f->opt->rpar.cmax - f->opt->rpar.cmin + 1 : 0,
wbuf, &f->wpar,
f->opt->join ? f->opt->wpar.cmax - f->opt->wpar.cmin + 1 : 0,
rbuf, &f->rpar, rch, wbuf, &f->wpar, wch,
f->xrun, f->opt->maxweight);
if (f->mode & MODE_PLAY)
dev_setvol(f->dev, rbuf, MIDI_TO_ADATA(f->vol));