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

use snd_pcm_poll_descriptors_count at initialisation

This commit is contained in:
Alexandre Ratchov 2012-10-26 15:01:04 +02:00
parent 80a52c9600
commit 532c615895
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libsndio/sio_alsa.c
View File

@ -45,7 +45,6 @@ static snd_output_t *output = NULL;
struct sio_alsa_hdl {
struct sio_hdl sio;
struct sio_par par;
struct pollfd *pfds;
snd_pcm_t *opcm;
snd_pcm_t *ipcm;
unsigned ibpf, obpf; /* bytes per frame */
@ -270,13 +269,12 @@ sio_alsa_open(const char *str, unsigned mode, int nbio)
goto bad_free_opcm;
}
}
hdl->nfds = SIO_MAXNFDS;
hdl->pfds = malloc(sizeof(struct pollfd) * hdl->nfds);
if (hdl->pfds == NULL) {
DPERROR("couldn't allocate pollfd structures");
goto bad_free_ipcm;
}
DPRINTF("mode = %d, allocated %d descriptors\n", mode, hdl->nfds);
hdl->nfds = 0;
if (mode & SIO_PLAY)
hdl->nfds += snd_pcm_poll_descriptors_count(hdl->opcm);
if (mode & SIO_REC)
hdl->nfds += snd_pcm_poll_descriptors_count(hdl->ipcm);
DPRINTF("mode = %d, nfds = %d\n", mode, hdl->nfds);
/*
* Default parameters may not be compatible with libsndio (eg. mulaw