MUX1 & MUX2 renaming.

diff --git a/src/mixer/elements.c b/src/mixer/elements.c
index a9f7c757d87b90d44f9847ef0902cf7b2303e766..b4431e69bb3df083d446f9743c9c68d6fac2d1e9 100644 (file)
--- 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 0e999f51b56b09a0cc03e66382240d87bbe0c833..65079e00b5e4d3d292e48520799f355b86f3bbed 100644 (file)
--- 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;