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

Merge branch 'master' into mixer

This commit is contained in:
Alexandre Ratchov 2017-11-04 08:58:52 +01:00
parent d0eda3c80a b06285beda
commit 752ac51f33
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.in
View File

@ -40,4 +40,5 @@ distclean: clean
sndioctl/Makefile \
xvolkeys/Makefile \
examples/Makefile \
contrib/init.d.sndiod
contrib/init.d.sndiod \
contrib/sndiod.service

4
aucat/aucat.c
View File

@ -346,6 +346,10 @@ slot_init(struct slot *s)
enc_init(&s->conv, &s->afile.par, slot_nch);
s->convbuf =
xmalloc(s->round * slot_nch * sizeof(adata_t));
enc_sil_do(&s->conv, s->buf.data, bufsz);
} else {
memset(s->buf.data, 0,
bufsz * slot_nch * sizeof(adata_t));
}
}
s->pstate = SLOT_INIT;

4
sndiod/dev.c
View File

@ -1763,6 +1763,10 @@ slot_attach(struct slot *s)
enc_init(&s->sub.enc, &s->par, slot_nch);
s->sub.encbuf =
xmalloc(s->round * slot_nch * sizeof(adata_t));
enc_sil_do(&s->sub.enc, s->sub.buf.data, s->appbufsz);
} else {
memset(s->sub.buf.data, 0,
s->appbufsz * slot_nch * sizeof(adata_t));
}
/*