From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 25 Jun 2001 13:08:43 +0000 (+0000)
Subject: Removed snd_ctl_card_info_t->mixerid and added the components member.
X-Git-Tag: v1.0.3~768
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=b0cef8e6666b100aa67157a195764a80fd5a4c41;p=alsa-lib.git

Removed snd_ctl_card_info_t->mixerid and added the components member.
---

diff --git a/include/control.h b/include/control.h
index 5d4cfca3..006c7117 100644
--- a/include/control.h
+++ b/include/control.h
@@ -210,8 +210,8 @@ const char *snd_ctl_card_info_get_id(const snd_ctl_card_info_t *obj);
 const char *snd_ctl_card_info_get_driver(const snd_ctl_card_info_t *obj);
 const char *snd_ctl_card_info_get_name(const snd_ctl_card_info_t *obj);
 const char *snd_ctl_card_info_get_longname(const snd_ctl_card_info_t *obj);
-const char *snd_ctl_card_info_get_mixerid(const snd_ctl_card_info_t *obj);
 const char *snd_ctl_card_info_get_mixername(const snd_ctl_card_info_t *obj);
+const char *snd_ctl_card_info_get_components(const snd_ctl_card_info_t *obj);
 
 size_t snd_ctl_event_sizeof(void);
 /** \hideinitializer
diff --git a/src/control/control.c b/src/control/control.c
index e5b8450b..c43025d8 100644
--- a/src/control/control.c
+++ b/src/control/control.c
@@ -1032,25 +1032,25 @@ const char *snd_ctl_card_info_get_longname(const snd_ctl_card_info_t *obj)
 }
 
 /**
- * \brief Get card mixer identificator from a CTL card info
+ * \brief Get card mixer name from a CTL card info
  * \param obj CTL card info
- * \return card mixer identificator
+ * \return card mixer name
  */
-const char *snd_ctl_card_info_get_mixerid(const snd_ctl_card_info_t *obj)
+const char *snd_ctl_card_info_get_mixername(const snd_ctl_card_info_t *obj)
 {
 	assert(obj);
-	return obj->mixerid;
+	return obj->mixername;
 }
 
 /**
- * \brief Get card mixer name from a CTL card info
+ * \brief Get card component list from a CTL card info
  * \param obj CTL card info
- * \return card mixer name
+ * \return card mixer identificator
  */
-const char *snd_ctl_card_info_get_mixername(const snd_ctl_card_info_t *obj)
+const char *snd_ctl_card_info_get_components(const snd_ctl_card_info_t *obj)
 {
 	assert(obj);
-	return obj->mixername;
+	return obj->components;
 }
 
 /**