mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04: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

4
include/control.h
View file

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

2
include/mixer.h
View file

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

2
include/pcm.h
View file

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

2
include/rawmidi.h
View file

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

2
include/seq.h
View file

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

2
include/timer.h
View file

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

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)