mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-02 09:01:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed descriptors_count

Browse source
This commit is contained in:
Abramo Bagnara 2001-02-18 18:32:30 +00:00
parent 0c7637393f
commit 191d03501e
12 changed files with 22 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/control/control.c
View file

@ -74,12 +74,10 @@ int _snd_ctl_poll_descriptor(snd_ctl_t *ctl)
return ctl->ops->poll_descriptor(ctl);
}
int snd_ctl_poll_descriptors_count(snd_ctl_t *ctl, unsigned int *count)
int snd_ctl_poll_descriptors_count(snd_ctl_t *ctl)
{
assert(ctl);
assert(count);
*count = 1;
return 0;
return 1;
}
int snd_ctl_poll_descriptors(snd_ctl_t *ctl, struct pollfd *pfds, unsigned int space)

5
src/control/hcontrol.c
View file

@ -83,11 +83,10 @@ int snd_hctl_async(snd_hctl_t *hctl, int sig, pid_t pid)
return snd_ctl_async(hctl->ctl, sig, pid);
}
int snd_hctl_poll_descriptors_count(snd_hctl_t *hctl, unsigned int *count)
int snd_hctl_poll_descriptors_count(snd_hctl_t *hctl)
{
assert(hctl);
assert(count);
return snd_ctl_poll_descriptors_count(hctl->ctl, count);
return snd_ctl_poll_descriptors_count(hctl->ctl);
}
int snd_hctl_poll_descriptors(snd_hctl_t *hctl, struct pollfd *pfds, unsigned int space)

12
src/mixer/mixer.c
View file

@ -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)

6
src/rawmidi/rawmidi.c
View file

@ -58,12 +58,10 @@ int _snd_rawmidi_poll_descriptor(snd_rawmidi_t *rmidi)
return rmidi->poll_fd;
}
int snd_rawmidi_poll_descriptors_count(snd_rawmidi_t *rmidi, unsigned int *count)
int snd_rawmidi_poll_descriptors_count(snd_rawmidi_t *rmidi)
{
assert(rmidi);
assert(count);
*count = 1;
return 0;
return 1;
}
int snd_rawmidi_poll_descriptors(snd_rawmidi_t *rmidi, struct pollfd *pfds, unsigned int space)

6
src/seq/seq.c
View file

@ -152,12 +152,10 @@ int _snd_seq_poll_descriptor(snd_seq_t *seq)
return seq->poll_fd;
}
int snd_seq_poll_descriptors_count(snd_seq_t *seq, unsigned int *count)
int snd_seq_poll_descriptors_count(snd_seq_t *seq)
{
assert(seq);
assert(count);
*count = 1;
return 0;
return 1;
}
int snd_seq_poll_descriptors(snd_seq_t *seq, struct pollfd *pfds, unsigned int space)

6
src/timer/timer.c
View file

@ -84,12 +84,10 @@ int _snd_timer_poll_descriptor(snd_timer_t *handle)
return tmr->fd;
}
int snd_timer_poll_descriptors_count(snd_timer_t *timer, unsigned int *count)
int snd_timer_poll_descriptors_count(snd_timer_t *timer)
{
assert(timer);
assert(count);
*count = 1;
return 0;
return 1;
}
int snd_timer_poll_descriptors(snd_timer_t *timer, struct pollfd *pfds, unsigned int space)