diff options
| author | Abramo Bagnara <abramo@alsa-project.org> | 2001-02-07 15:13:15 +0000 |
|---|---|---|
| committer | Abramo Bagnara <abramo@alsa-project.org> | 2001-02-07 15:13:15 +0000 |
| commit | 45c416ed826437fcd34712fe84af127a46b3719a (patch) | |
| tree | f1910f20221f551e11a518ad90ca24d33c445696 /aserver | |
| parent | 66f13f61152b244c7f534402b26757bc502e36a2 (diff) | |
Better names for control API
Diffstat (limited to 'aserver')
| -rw-r--r-- | aserver/aserver.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/aserver/aserver.c b/aserver/aserver.c index 5ad6826d..95233071 100644 --- a/aserver/aserver.c +++ b/aserver/aserver.c @@ -572,27 +572,27 @@ int ctl_shm_cmd(client_t *client) ctl = client->device.control.handle; switch (cmd) { case SNDRV_CTL_IOCTL_INFO: - ctrl->result = snd_ctl_info(ctl, &ctrl->u.hw_info); + ctrl->result = snd_ctl_card_info(ctl, &ctrl->u.hw_info); break; - case SNDRV_CTL_IOCTL_CONTROL_LIST: + case SNDRV_CTL_IOCTL_ELEMENT_LIST: { size_t maxsize = CTL_SHM_DATA_MAXLEN; if (ctrl->u.clist.space * sizeof(*ctrl->u.clist.pids) > maxsize) { ctrl->result = -EFAULT; break; } - ctrl->u.clist.pids = (snd_control_id_t*) ctrl->data; + ctrl->u.clist.pids = (snd_ctl_element_id_t*) ctrl->data; ctrl->result = snd_ctl_clist(ctl, &ctrl->u.clist); break; } - case SNDRV_CTL_IOCTL_CONTROL_INFO: - ctrl->result = snd_ctl_cinfo(ctl, &ctrl->u.cinfo); + case SNDRV_CTL_IOCTL_ELEMENT_INFO: + ctrl->result = snd_ctl_element_info(ctl, &ctrl->u.cinfo); break; - case SNDRV_CTL_IOCTL_CONTROL_READ: - ctrl->result = snd_ctl_cread(ctl, &ctrl->u.cread); + case SNDRV_CTL_IOCTL_ELEMENT_READ: + ctrl->result = snd_ctl_element_read(ctl, &ctrl->u.cread); break; - case SNDRV_CTL_IOCTL_CONTROL_WRITE: - ctrl->result = snd_ctl_cwrite(ctl, &ctrl->u.cwrite); + case SNDRV_CTL_IOCTL_ELEMENT_WRITE: + ctrl->result = snd_ctl_element_write(ctl, &ctrl->u.cwrite); break; case SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE: ctrl->result = snd_ctl_hwdep_next_device(ctl, &ctrl->u.device); |