From: Abramo Bagnara Date: Sun, 18 Feb 2001 18:32:30 +0000 (+0000) Subject: Changed descriptors_count X-Git-Tag: android-x86-9.0-r1~3005 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=191d03501e23f03b0c6292c0417df428031d08dd;p=android-x86%2Fexternal-alsa-lib.git Changed descriptors_count --- diff --git a/include/control.h b/include/control.h index 2ec4d07f..fb56a064 100644 --- a/include/control.h +++ b/include/control.h @@ -160,7 +160,7 @@ int snd_ctl_open(snd_ctl_t **ctl, const char *name); int snd_ctl_close(snd_ctl_t *ctl); int snd_ctl_nonblock(snd_ctl_t *ctl, int nonblock); int snd_ctl_async(snd_ctl_t *ctl, int sig, pid_t pid); -int snd_ctl_poll_descriptors_count(snd_ctl_t *ctl, unsigned int *count); +int snd_ctl_poll_descriptors_count(snd_ctl_t *ctl); int snd_ctl_poll_descriptors(snd_ctl_t *ctl, struct pollfd *pfds, unsigned int space); int snd_ctl_subscribe_events(snd_ctl_t *ctl, int subscribe); int snd_ctl_card_info(snd_ctl_t *ctl, snd_ctl_card_info_t *info); @@ -227,7 +227,7 @@ int snd_hctl_open(snd_hctl_t **hctl, const char *name); int snd_hctl_close(snd_hctl_t *hctl); int snd_hctl_nonblock(snd_hctl_t *hctl, int nonblock); int snd_hctl_async(snd_hctl_t *hctl, int sig, pid_t pid); -int snd_hctl_poll_descriptors_count(snd_hctl_t *hctl, unsigned int *count); +int snd_hctl_poll_descriptors_count(snd_hctl_t *hctl); int snd_hctl_poll_descriptors(snd_hctl_t *hctl, struct pollfd *pfds, unsigned int space); unsigned int snd_hctl_get_count(snd_hctl_t *hctl); int snd_hctl_set_compare(snd_hctl_t *hctl, snd_hctl_compare_t hsort); diff --git a/include/mixer.h b/include/mixer.h index 5b223ed1..23e4d3b3 100644 --- a/include/mixer.h +++ b/include/mixer.h @@ -44,7 +44,7 @@ snd_mixer_elem_t *snd_mixer_last_elem(snd_mixer_t *mixer); int snd_mixer_handle_events(snd_mixer_t *mixer); int snd_mixer_attach(snd_mixer_t *mixer, const char *name); int snd_mixer_detach(snd_mixer_t *mixer, const char *name); -int snd_mixer_poll_descriptors_count(snd_mixer_t *mixer, unsigned int *count); +int snd_mixer_poll_descriptors_count(snd_mixer_t *mixer); int snd_mixer_poll_descriptors(snd_mixer_t *mixer, struct pollfd *pfds, unsigned int space); int snd_mixer_load(snd_mixer_t *mixer); int snd_mixer_wait(snd_mixer_t *mixer, int timeout); diff --git a/include/pcm.h b/include/pcm.h index 4eb6ef0b..81a93453 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -216,7 +216,7 @@ int snd_pcm_open(snd_pcm_t **pcm, const char *name, snd_pcm_type_t snd_pcm_type(snd_pcm_t *pcm); int snd_pcm_close(snd_pcm_t *pcm); -int snd_pcm_poll_descriptors_count(snd_pcm_t *pcm, unsigned int *count); +int snd_pcm_poll_descriptors_count(snd_pcm_t *pcm); int snd_pcm_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space); int snd_pcm_nonblock(snd_pcm_t *pcm, int nonblock); int snd_pcm_async(snd_pcm_t *pcm, int sig, pid_t pid); diff --git a/include/rawmidi.h b/include/rawmidi.h index b46f7b5b..535d3b08 100644 --- a/include/rawmidi.h +++ b/include/rawmidi.h @@ -47,7 +47,7 @@ extern "C" { int snd_rawmidi_open(snd_rawmidi_t **in_rmidi, snd_rawmidi_t **out_rmidi, const char *name, int mode); int snd_rawmidi_close(snd_rawmidi_t *rmidi); -int snd_rawmidi_poll_descriptors_count(snd_rawmidi_t *rmidi, unsigned int *count); +int snd_rawmidi_poll_descriptors_count(snd_rawmidi_t *rmidi); int snd_rawmidi_poll_descriptors(snd_rawmidi_t *rmidi, struct pollfd *pfds, unsigned int space); int snd_rawmidi_nonblock(snd_rawmidi_t *rmidi, int nonblock); int snd_rawmidi_info(snd_rawmidi_t *rmidi, snd_rawmidi_info_t * info); diff --git a/include/seq.h b/include/seq.h index 16730eb8..f53b5982 100644 --- a/include/seq.h +++ b/include/seq.h @@ -324,7 +324,7 @@ extern "C" { int snd_seq_open(snd_seq_t **handle, const char *name, int streams, int mode); int snd_seq_close(snd_seq_t *handle); -int snd_seq_poll_descriptors_count(snd_seq_t *handle, unsigned int *count); +int snd_seq_poll_descriptors_count(snd_seq_t *handle); int snd_seq_poll_descriptors(snd_seq_t *handle, struct pollfd *pfds, unsigned int space); int snd_seq_nonblock(snd_seq_t *handle, int nonblock); int snd_seq_client_id(snd_seq_t *handle); diff --git a/include/timer.h b/include/timer.h index e72d19a0..2e0496fd 100644 --- a/include/timer.h +++ b/include/timer.h @@ -50,7 +50,7 @@ extern "C" { int snd_timer_open(snd_timer_t **handle); int snd_timer_close(snd_timer_t *handle); -int snd_timer_poll_descriptors_count(snd_timer_t *handle, unsigned int *count); +int snd_timer_poll_descriptors_count(snd_timer_t *handle); int snd_timer_poll_descriptors(snd_timer_t *handle, struct pollfd *pfds, unsigned int space); int snd_timer_next_device(snd_timer_t *handle, snd_timer_id_t *tid); int snd_timer_select(snd_timer_t *handle, snd_timer_select_t *tselect); diff --git a/src/control/control.c b/src/control/control.c index d9d8d404..e99b17e7 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -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) diff --git a/src/control/hcontrol.c b/src/control/hcontrol.c index 1b4612cc..00e8ee4d 100644 --- a/src/control/hcontrol.c +++ b/src/control/hcontrol.c @@ -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) 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) diff --git a/src/rawmidi/rawmidi.c b/src/rawmidi/rawmidi.c index a5be7a7c..7dd902e0 100644 --- a/src/rawmidi/rawmidi.c +++ b/src/rawmidi/rawmidi.c @@ -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) diff --git a/src/seq/seq.c b/src/seq/seq.c index 3d3e5aa1..94675e04 100644 --- a/src/seq/seq.c +++ b/src/seq/seq.c @@ -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) diff --git a/src/timer/timer.c b/src/timer/timer.c index 38c1498a..da5b6803 100644 --- a/src/timer/timer.c +++ b/src/timer/timer.c @@ -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)