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

Split dev_open() in two parts. 

The first part resets audio parameters to the prefered ones, the
second part opens the device and allocates the audio buffers. No
behavior change.
This commit is contained in:
Alexandre Ratchov 2019-08-29 09:25:59 +02:00
parent 6a68d29389
commit 803cf23380
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sndiod/dev.c
View File

@ -58,6 +58,7 @@ int dev_getpos(struct dev *);
struct dev *dev_new(char *, struct aparams *, unsigned int, unsigned int,
unsigned int, unsigned int, unsigned int, unsigned int);
void dev_adjpar(struct dev *, int, int, int);
int dev_open_do(struct dev *);
int dev_open(struct dev *);
void dev_exitall(struct dev *);
void dev_close(struct dev *);
@ -1030,24 +1031,11 @@ dev_adjpar(struct dev *d, int mode,
* monitor, midi control, and any necessary conversions.
*/
int
dev_open(struct dev *d)
dev_open_do(struct dev *d)
{
d->mode = d->reqmode;
d->round = d->reqround;
d->bufsz = d->reqbufsz;
d->rate = d->reqrate;
d->pchan = d->reqpchan;
d->rchan = d->reqrchan;
d->par = d->reqpar;
if (d->pchan == 0)
d->pchan = 2;
if (d->rchan == 0)
d->rchan = 2;
if (!dev_sio_open(d)) {
if (log_level >= 1) {
dev_log(d);
log_puts(": ");
log_puts(d->path);
log_puts(": failed to open audio device\n");
}
return 0;
@ -1109,6 +1097,28 @@ dev_open(struct dev *d)
return 1;
}
/*
* Reset parameters and open the device.
*/
int
dev_open(struct dev *d)
{
d->mode = d->reqmode;
d->round = d->reqround;
d->bufsz = d->reqbufsz;
d->rate = d->reqrate;
d->pchan = d->reqpchan;
d->rchan = d->reqrchan;
d->par = d->reqpar;
if (d->pchan == 0)
d->pchan = 2;
if (d->rchan == 0)
d->rchan = 2;
if (!dev_open_do(d))
return 0;
return 1;
}
/*
* Force all slots to exit
*/