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

Merged pcmplug branch.

Browse source
This commit is contained in:
Jaroslav Kysela 2000-09-24 09:57:26 +00:00
parent 40d1ee071d
commit 6962a9d6ce
61 changed files with 7172 additions and 6743 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/control/control.c
View file

@ -43,10 +43,10 @@ int snd_ctl_close(snd_ctl_t *ctl)
return res;
}
int snd_ctl_file_descriptor(snd_ctl_t *ctl)
int snd_ctl_poll_descriptor(snd_ctl_t *ctl)
{
assert(ctl);
return ctl->ops->file_descriptor(ctl);
return ctl->ops->poll_descriptor(ctl);
}
int snd_ctl_hw_info(snd_ctl_t *ctl, snd_ctl_hw_info_t *info)

4
src/control/control_client.c
View file

@ -101,7 +101,7 @@ static int snd_ctl_client_shm_close(snd_ctl_t *ctl)
return result;
}
static int snd_ctl_client_file_descriptor(snd_ctl_t *ctl)
static int snd_ctl_client_poll_descriptor(snd_ctl_t *ctl)
{
snd_ctl_client_t *client = ctl->private;
return client->data_fd;
@ -255,7 +255,7 @@ static int snd_ctl_client_shm_read(snd_ctl_t *ctl, snd_ctl_event_t *event)
struct snd_ctl_ops snd_ctl_client_ops = {
close: snd_ctl_client_shm_close,
file_descriptor: snd_ctl_client_file_descriptor,
poll_descriptor: snd_ctl_client_poll_descriptor,
hw_info: snd_ctl_client_shm_hw_info,
clist: snd_ctl_client_shm_clist,
cinfo: snd_ctl_client_shm_cinfo,

4
src/control/control_hw.c
View file

@ -48,7 +48,7 @@ static int snd_ctl_hw_close(snd_ctl_t *handle)
return res;
}
static int snd_ctl_hw_file_descriptor(snd_ctl_t *handle)
static int snd_ctl_hw_poll_descriptor(snd_ctl_t *handle)
{
snd_ctl_hw_t *hw = handle->private;
return hw->fd;
@ -134,7 +134,7 @@ static int snd_ctl_hw_read(snd_ctl_t *handle, snd_ctl_event_t *event)
struct snd_ctl_ops snd_ctl_hw_ops = {
close: snd_ctl_hw_close,
file_descriptor: snd_ctl_hw_file_descriptor,
poll_descriptor: snd_ctl_hw_poll_descriptor,
hw_info: snd_ctl_hw_hw_info,
clist: snd_ctl_hw_clist,
cinfo: snd_ctl_hw_cinfo,

2
src/control/control_local.h
View file

@ -25,7 +25,7 @@
struct snd_ctl_ops {
int (*close)(snd_ctl_t *handle);
int (*file_descriptor)(snd_ctl_t *handle);
int (*poll_descriptor)(snd_ctl_t *handle);
int (*hw_info)(snd_ctl_t *handle, snd_ctl_hw_info_t *info);
int (*clist)(snd_ctl_t *handle, snd_control_list_t *list);
int (*cinfo)(snd_ctl_t *handle, snd_control_info_t *info);