summaryrefslogtreecommitdiff
path: root/src/mixer/mixer.c
diff options
context:
space:
mode:
authorAbramo Bagnara <abramo@alsa-project.org>2001-02-18 18:32:30 +0000
committerAbramo Bagnara <abramo@alsa-project.org>2001-02-18 18:32:30 +0000
commit191d03501e23f03b0c6292c0417df428031d08dd (patch)
tree276c2c04165617ac21b6c37e4624fe540330043d /src/mixer/mixer.c
parent0c7637393f25e059cdcd448c5a9baf9666ec2e1c (diff)
Changed descriptors_count
Diffstat (limited to 'src/mixer/mixer.c')
-rw-r--r--src/mixer/mixer.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c
index 936887b3..3cb88089 100644
--- a/src/mixer/mixer.c
+++ b/src/mixer/mixer.c
@@ -438,23 +438,21 @@ int snd_mixer_set_compare(snd_mixer_t *mixer, snd_mixer_compare_t msort)
return 0;
}
-int snd_mixer_poll_descriptors_count(snd_mixer_t *mixer, unsigned int *count)
+int snd_mixer_poll_descriptors_count(snd_mixer_t *mixer)
{
struct list_head *pos;
- unsigned int c = 0, v;
+ unsigned int c = 0;
assert(mixer);
- assert(count);
list_for_each(pos, &mixer->slaves) {
snd_mixer_slave_t *s;
int n;
s = list_entry(pos, snd_mixer_slave_t, list);
- n = snd_hctl_poll_descriptors_count(s->hctl, &v);
+ n = snd_hctl_poll_descriptors_count(s->hctl);
if (n < 0)
return n;
- c += v;
+ c += n;
}
- *count = c;
- return 0;
+ return c;
}
int snd_mixer_poll_descriptors(snd_mixer_t *mixer, struct pollfd *pfds, unsigned int space)