From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 17 Apr 2000 18:55:13 +0000 (+0000)
Subject: MUX1 & MUX2 renaming.
X-Git-Tag: v1.0.3~1280
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=03066b8131ebe2f86623e0dd33634a439a586a0f;p=alsa-lib.git

MUX1 & MUX2 renaming.
---

diff --git a/src/mixer/elements.c b/src/mixer/elements.c
index a9f7c757..b4431e69 100644
--- a/src/mixer/elements.c
+++ b/src/mixer/elements.c
@@ -277,10 +277,10 @@ int snd_mixer_element_build(snd_mixer_t *handle, snd_mixer_element_t *element)
 			return err;
 		break;
 	case SND_MIXER_ETYPE_MUX1:
-		element->data.mux1.output_size = element->data.mux1.output_over;
-		element->data.mux1.output = element->data.mux1.output_over = 0;
-		element->data.mux1.poutput = (snd_mixer_eid_t *)malloc(element->data.mux1.output_size * sizeof(snd_mixer_eid_t));
-		if (!element->data.mux1.poutput)
+		element->data.mux1.sel_size = element->data.mux1.sel_over;
+		element->data.mux1.sel = element->data.mux1.sel_over = 0;
+		element->data.mux1.psel = (snd_mixer_eid_t *)malloc(element->data.mux1.sel_size * sizeof(snd_mixer_eid_t));
+		if (!element->data.mux1.psel)
 			return -ENOMEM;
 		if ((err = snd_mixer_element_read(handle, element)) < 0)
 			return err;
@@ -330,7 +330,7 @@ int snd_mixer_element_free(snd_mixer_element_t *element)
 		safe_free((void **)&element->data.accu3.pvoices);
 		break;
 	case SND_MIXER_ETYPE_MUX1:
-		safe_free((void **)&element->data.mux1.poutput);
+		safe_free((void **)&element->data.mux1.psel);
 		break;
 	case SND_MIXER_ETYPE_PRE_EFFECT1:
 		if (element->data.peffect1.item < 0)
diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c
index 0e999f51..65079e00 100644
--- a/src/mixer/mixer.c
+++ b/src/mixer/mixer.c
@@ -32,7 +32,7 @@
 #include <search.h>
 
 #define SND_FILE_MIXER		"/dev/snd/mixerC%iD%i"
-#define SND_MIXER_VERSION_MAX	SND_PROTOCOL_VERSION(1, 0, 0)
+#define SND_MIXER_VERSION_MAX	SND_PROTOCOL_VERSION(1, 0, 1)
 
 struct snd_mixer {
 	int card;