mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-03-15 05:33:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ctl: use consistent name for second argument of snd_ctl_elem_read/write

Browse source 
Second argument of these functions has three different names in
documentation/header/code (obj/control/value). This easily causes users'
confusion.

This commit applies consistent names for the arguments.

Fixes: 90020c05f8 ('ctl: improve comments for handling element data')
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2016-06-28 22:39:50 +09:00 • committed by Takashi Iwai
parent 06a51e29f4
commit 7117d22cf2
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/control.h
View file

@ -245,8 +245,8 @@ 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); int snd_ctl_card_info(snd_ctl_t *ctl, snd_ctl_card_info_t *info);
int snd_ctl_elem_list(snd_ctl_t *ctl, snd_ctl_elem_list_t *list); int snd_ctl_elem_list(snd_ctl_t *ctl, snd_ctl_elem_list_t *list);
int snd_ctl_elem_info(snd_ctl_t *ctl, snd_ctl_elem_info_t *info); int snd_ctl_elem_info(snd_ctl_t *ctl, snd_ctl_elem_info_t *info);
int snd_ctl_elem_read(snd_ctl_t *ctl, snd_ctl_elem_value_t *value); int snd_ctl_elem_read(snd_ctl_t *ctl, snd_ctl_elem_value_t *data);
int snd_ctl_elem_write(snd_ctl_t *ctl, snd_ctl_elem_value_t *value); int snd_ctl_elem_write(snd_ctl_t *ctl, snd_ctl_elem_value_t *data);
int snd_ctl_elem_lock(snd_ctl_t *ctl, snd_ctl_elem_id_t *id); int snd_ctl_elem_lock(snd_ctl_t *ctl, snd_ctl_elem_id_t *id);
int snd_ctl_elem_unlock(snd_ctl_t *ctl, snd_ctl_elem_id_t *id); int snd_ctl_elem_unlock(snd_ctl_t *ctl, snd_ctl_elem_id_t *id);
int snd_ctl_elem_tlv_read(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, int snd_ctl_elem_tlv_read(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id,

16
src/control/control.c
View file

@ -820,27 +820,27 @@ int snd_ctl_elem_remove(snd_ctl_t *ctl, snd_ctl_elem_id_t *id)
/** /**
* \brief Get CTL element value * \brief Get CTL element value
* \param ctl CTL handle * \param ctl CTL handle
* \param obj Data of an element. * \param data Data of an element.
* \return 0 on success otherwise a negative error code * \return 0 on success otherwise a negative error code
*/ */
int snd_ctl_elem_read(snd_ctl_t *ctl, snd_ctl_elem_value_t *control) int snd_ctl_elem_read(snd_ctl_t *ctl, snd_ctl_elem_value_t *data)
{ {
assert(ctl && control && (control->id.name[0] || control->id.numid)); assert(ctl && data && (data->id.name[0] || data->id.numid));
return ctl->ops->element_read(ctl, control); return ctl->ops->element_read(ctl, data);
} }
/** /**
* \brief Set CTL element value * \brief Set CTL element value
* \param ctl CTL handle * \param ctl CTL handle
* \param obj Data of an element. * \param data Data of an element.
* \retval 0 on success * \retval 0 on success
* \retval >0 on success when value was changed * \retval >0 on success when value was changed
* \retval <0 a negative error code * \retval <0 a negative error code
*/ */
int snd_ctl_elem_write(snd_ctl_t *ctl, snd_ctl_elem_value_t *control) int snd_ctl_elem_write(snd_ctl_t *ctl, snd_ctl_elem_value_t *data)
{ {
assert(ctl && control && (control->id.name[0] || control->id.numid)); assert(ctl && data && (data->id.name[0] || data->id.numid));
return ctl->ops->element_write(ctl, control); return ctl->ops->element_write(ctl, data);
} }
static int snd_ctl_tlv_do(snd_ctl_t *ctl, int op_flag, static int snd_ctl_tlv_do(snd_ctl_t *ctl, int op_flag,