Removed snd_ctl_card_info_t->mixerid and added the components member.

diff --git a/include/control.h b/include/control.h
index 5d4cfca3e50b7da4744ef3ca8e2beecaf2cca37b..006c71178484e69490fa068fdc639ec08cfc00d4 100644 (file)
--- 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 e5b8450b79dd3eff083aa3e1c6d3d1b41c56a3f2..c43025d8955312740ca13021253788e4c5bf8fc1 100644 (file)
--- 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;
 }
 
 /**