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

dont check dev_cycle() ret val as we check dev state

This commit is contained in:
Alexandre Ratchov 2014-03-17 18:42:20 +01:00
parent 4b820e4de0
commit c95cb04987
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sndiod/dev.c
View File

@ -50,7 +50,6 @@ void dev_mon_snoop(struct dev *);
int play_filt_resamp(struct slot *, void *, void *, int); int play_filt_resamp(struct slot *, void *, void *, int);
int play_filt_dec(struct slot *, void *, void *, int); int play_filt_dec(struct slot *, void *, void *, int);
void dev_mix_badd(struct dev *, struct slot *); void dev_mix_badd(struct dev *, struct slot *);
void dev_empty_cycle(struct dev *);
void dev_mix_adjvol(struct dev *); void dev_mix_adjvol(struct dev *);
int rec_filt_resamp(struct slot *, void *, void *, int); int rec_filt_resamp(struct slot *, void *, void *, int);
int rec_filt_enc(struct slot *, void *, void *, int); int rec_filt_enc(struct slot *, void *, void *, int);
@ -58,7 +57,7 @@ void dev_sub_bcopy(struct dev *, struct slot *);
void dev_onmove(struct dev *, int); void dev_onmove(struct dev *, int);
void dev_master(struct dev *, unsigned int); void dev_master(struct dev *, unsigned int);
int dev_cycle(struct dev *); void dev_cycle(struct dev *);
int dev_getpos(struct dev *); int dev_getpos(struct dev *);
struct dev *dev_new(char *, struct aparams *, unsigned int, unsigned int, struct dev *dev_new(char *, struct aparams *, unsigned int, unsigned int,
unsigned int, unsigned int, unsigned int, unsigned int); unsigned int, unsigned int, unsigned int, unsigned int);
@ -630,11 +629,6 @@ dev_mix_badd(struct dev *d, struct slot *s)
abuf_rdiscard(&s->mix.buf, s->round * s->mix.bpf); abuf_rdiscard(&s->mix.buf, s->round * s->mix.bpf);
} }
void
dev_empty_cycle(struct dev *d)
{
}
/* /*
* Normalize input levels. * Normalize input levels.
*/ */
@ -752,7 +746,7 @@ dev_sub_bcopy(struct dev *d, struct slot *s)
* run a one block cycle, return 0 if the device was stopped and/or * run a one block cycle, return 0 if the device was stopped and/or
* closed. * closed.
*/ */
int void
dev_cycle(struct dev *d) dev_cycle(struct dev *d)
{ {
struct slot *s, **ps; struct slot *s, **ps;
@ -772,7 +766,7 @@ dev_cycle(struct dev *d)
d->pstate = DEV_INIT; d->pstate = DEV_INIT;
if (d->refcnt == 0) if (d->refcnt == 0)
dev_close(d); dev_close(d);
return 0; return;
} }
if (d->prime > 0) { if (d->prime > 0) {
@ -792,7 +786,7 @@ dev_cycle(struct dev *d)
d->encbuf, d->round); d->encbuf, d->round);
} }
d->prime -= d->round; d->prime -= d->round;
return 1; return;
} }
d->delta -= d->round; d->delta -= d->round;
@ -925,7 +919,6 @@ dev_cycle(struct dev *d)
enc_do(&d->enc, (unsigned char *)DEV_PBUF(d), enc_do(&d->enc, (unsigned char *)DEV_PBUF(d),
d->encbuf, d->round); d->encbuf, d->round);
} }
return 1;
} }
/* /*

2
sndiod/dev.h
View File

@ -206,7 +206,7 @@ unsigned int dev_roundof(struct dev *, unsigned int);
* interface to hardware device * interface to hardware device
*/ */
void dev_onmove(struct dev *, int); void dev_onmove(struct dev *, int);
int dev_cycle(struct dev *); void dev_cycle(struct dev *);
/* /*
* midi & midi call-backs * midi & midi call-backs

3
sndiod/siofile.c
View File

@ -348,8 +348,7 @@ dev_sio_run(void *arg)
panic(); panic();
} }
#endif #endif
if (!dev_cycle(d)) dev_cycle(d);
return;
if (d->mode & MODE_PLAY) { if (d->mode & MODE_PLAY) {
d->sio.cstate = DEV_SIO_WRITE; d->sio.cstate = DEV_SIO_WRITE;
d->sio.todo = d->round * d->pchan * d->par.bps; d->sio.todo = d->round * d->pchan * d->par.bps;