mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-01 22:58:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove poll_ask callback

Browse source 
Removed poll_ask callbacks.
poll_ask function is merged to poll_descriptors callbacks.
This commit is contained in:
Takashi Iwai 2005-05-18 10:50:09 +00:00
parent e61d385993
commit a6d3b9e4e0
18 changed files with 24 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/pcm/pcm_multi.c
View file

@ -105,7 +105,20 @@ static int snd_pcm_multi_poll_descriptors_count(snd_pcm_t *pcm)
static int snd_pcm_multi_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space)
{
snd_pcm_multi_t *multi = pcm->private_data;
snd_pcm_t *slave;
snd_pcm_t *slave_0 = multi->slaves[multi->master_slave].pcm;
int err;
unsigned int i;
for (i = 0; i < multi->slaves_count; ++i) {
slave = multi->slaves[i].pcm;
if (slave == slave_0)
continue;
err = snd_pcm_poll_descriptors(slave, pfds, space);
if (err < 0)
return err;
}
/* finally overwrite with master's pfds */
return snd_pcm_poll_descriptors(slave_0, pfds, space);
}
@ -584,23 +597,6 @@ static int snd_pcm_multi_resume(snd_pcm_t *pcm)
return err;
}
static int snd_pcm_multi_poll_ask(snd_pcm_t *pcm)
{
snd_pcm_multi_t *multi = pcm->private_data;
snd_pcm_t *slave;
int err = 0;
unsigned int i;
for (i = 0; i < multi->slaves_count; ++i) {
slave = multi->slaves[i].pcm;
if (slave->fast_ops->poll_ask == NULL)
continue;
err = slave->fast_ops->poll_ask(slave->fast_op_arg);
if (err < 0)
return err;
}
return err;
}
static int snd_pcm_multi_link_fd_failed(snd_pcm_t *pcm, int fd)
{
snd_pcm_multi_t *multi = pcm->private_data;
@ -733,7 +729,6 @@ static snd_pcm_fast_ops_t snd_pcm_multi_fast_ops = {
.rewind = snd_pcm_multi_rewind,
.forward = snd_pcm_multi_forward,
.resume = snd_pcm_multi_resume,
.poll_ask = snd_pcm_multi_poll_ask,
.link_fd = snd_pcm_multi_link_fd,
.link = snd_pcm_generic_link2,
.unlink = snd_pcm_multi_unlink,