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

backout latest

This commit is contained in:
Alexandre Ratchov 2014-03-17 17:44:47 +01:00
parent d00caaaf96
commit 559d953ef6
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sndiod/dev.c
View File

@ -1617,7 +1617,6 @@ slot_setvol(struct slot *s, unsigned int vol)
void
slot_attach(struct slot *s)
{
struct slot **ps;
struct dev *d = s->dev;
unsigned int slot_nch, dev_nch;
long long pos;
@ -1661,27 +1660,12 @@ slot_attach(struct slot *s)
#ifdef DEBUG
if ((s->mode & d->mode) != s->mode) {
slot_log(s);
log_puts(": mode beyond device mode\n");
log_puts(": mode beyond device mode, not attaching\n");
panic();
}
#endif
/*
* attach slot to the list
*/
ps = &d->slot_list;
if (s->mode & MODE_MON) {
/*
* attach slot at the end of the list as other slots
* must be processed first to produce the data to
* monitor
*/
while (*ps != NULL)
ps = &(*ps)->next;
}
s->next = *ps;
*ps = s;
s->next = d->slot_list;
d->slot_list = s;
s->skip = 0;
if (s->mode & MODE_PLAY) {
slot_nch = s->mix.slot_cmax - s->mix.slot_cmin + 1;

7
sndiod/sock.c
View File

@ -854,13 +854,6 @@ sock_hello(struct sock *f)
mode |= MODE_MON;
mode &= ~MODE_REC;
}
if ((mode & MODE_MON) && (mode & MODE_PLAY)) {
if (log_level >= 1) {
sock_log(f);
log_puts(": cannot play and monitor\n");
}
return 0;
}
if ((mode & f->opt->mode) != mode) {
if (log_level >= 1) {
sock_log(f);