From: Abramo Bagnara <abramo@alsa-project.org>
Date: Tue, 13 Feb 2001 11:42:49 +0000 (+0000)
Subject: Removed Capture Source exceptions. Renamed snd_hctl_elem_get_handle
X-Git-Tag: android-x86-9.0-r1~3019
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=db53ac9b41593646606087074ac01703a50b18ac;p=android-x86%2Fexternal-alsa-lib.git

Removed Capture Source exceptions. Renamed snd_hctl_elem_get_handle
---

diff --git a/include/control.h b/include/control.h
index 8730b574..586db0d1 100644
--- a/include/control.h
+++ b/include/control.h
@@ -238,7 +238,7 @@ int snd_hctl_elem_info(snd_hctl_elem_t *elem, snd_ctl_elem_info_t * info);
 int snd_hctl_elem_read(snd_hctl_elem_t *elem, snd_ctl_elem_value_t * value);
 int snd_hctl_elem_write(snd_hctl_elem_t *elem, snd_ctl_elem_value_t * value);
 
-snd_hctl_t *snd_hctl_elem_get_handle(snd_hctl_elem_t *elem);
+snd_hctl_t *snd_hctl_elem_get_hctl(snd_hctl_elem_t *elem);
 
 #ifdef __cplusplus
 }
diff --git a/src/control/hcontrol.c b/src/control/hcontrol.c
index e865e169..7b24ccd7 100644
--- a/src/control/hcontrol.c
+++ b/src/control/hcontrol.c
@@ -552,7 +552,7 @@ int snd_hctl_elem_write(snd_hctl_elem_t *elem, snd_ctl_elem_value_t * value)
 	return snd_ctl_elem_write(elem->hctl->ctl, value);
 }
 
-snd_hctl_t *snd_hctl_elem_get_handle(snd_hctl_elem_t *elem)
+snd_hctl_t *snd_hctl_elem_get_hctl(snd_hctl_elem_t *elem)
 {
 	assert(elem);
 	return elem->hctl;
diff --git a/src/mixer/simple.c b/src/mixer/simple.c
index 9633d144..1eeb6546 100644
--- a/src/mixer/simple.c
+++ b/src/mixer/simple.c
@@ -743,24 +743,6 @@ int simple_event_add(snd_mixer_class_t *class, snd_hctl_elem_t *helem)
 			err = snd_hctl_elem_info(helem, info);
 			assert(err >= 0);
 			n = snd_ctl_elem_info_get_item_name(info);
-			if (!strcmp(n, "Mix") || !strcmp(n, "Mono Mix")) {
-				snd_hctl_t *hctl;
-				hctl = snd_hctl_elem_get_handle(helem);
-				if (hctl != NULL) {
-					snd_ctl_elem_id_t *eid;
-					snd_ctl_elem_id_alloca(&eid);
-					snd_ctl_elem_id_set_interface(eid, SND_CTL_ELEM_IFACE_MIXER);
-					if (!strcmp(n, "Mix")) {
-						snd_ctl_elem_id_set_name(eid, "Mix");
-						if (snd_hctl_find_elem(hctl, eid) == NULL)
-							n = "Master";
-					} else if (!strcmp(n, "Mono Mix")) {
-						snd_ctl_elem_id_set_name(eid, "Mono Mix");
-						if (snd_hctl_find_elem(hctl, eid) == NULL)
-							n = "Master Mono";
-					}
-				}
-			}
 			err = simple_add1(class, n, helem, CTL_CAPTURE_SOURCE, k);
 			if (err < 0)
 				return err;