mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MUX1 & MUX2 renaming.

Browse source
This commit is contained in:
Jaroslav Kysela 2000-04-17 18:55:13 +00:00
parent ff5f643228
commit 03066b8131
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/mixer/elements.c
View file

@ -277,10 +277,10 @@ int snd_mixer_element_build(snd_mixer_t *handle, snd_mixer_element_t *element)
return err; return err;
break; break;
case SND_MIXER_ETYPE_MUX1: case SND_MIXER_ETYPE_MUX1:
element->data.mux1.output_size = element->data.mux1.output_over; element->data.mux1.sel_size = element->data.mux1.sel_over;
element->data.mux1.output = element->data.mux1.output_over = 0; element->data.mux1.sel = element->data.mux1.sel_over = 0;
element->data.mux1.poutput = (snd_mixer_eid_t *)malloc(element->data.mux1.output_size * sizeof(snd_mixer_eid_t)); element->data.mux1.psel = (snd_mixer_eid_t *)malloc(element->data.mux1.sel_size * sizeof(snd_mixer_eid_t));
if (!element->data.mux1.poutput) if (!element->data.mux1.psel)
return -ENOMEM; return -ENOMEM;
if ((err = snd_mixer_element_read(handle, element)) < 0) if ((err = snd_mixer_element_read(handle, element)) < 0)
return err; return err;
@ -330,7 +330,7 @@ int snd_mixer_element_free(snd_mixer_element_t *element)
safe_free((void **)&element->data.accu3.pvoices); safe_free((void **)&element->data.accu3.pvoices);
break; break;
case SND_MIXER_ETYPE_MUX1: case SND_MIXER_ETYPE_MUX1:
safe_free((void **)&element->data.mux1.poutput); safe_free((void **)&element->data.mux1.psel);
break; break;
case SND_MIXER_ETYPE_PRE_EFFECT1: case SND_MIXER_ETYPE_PRE_EFFECT1:
if (element->data.peffect1.item < 0) if (element->data.peffect1.item < 0)

2
src/mixer/mixer.c
View file

@ -32,7 +32,7 @@
#include <search.h> #include <search.h>
#define SND_FILE_MIXER "/dev/snd/mixerC%iD%i" #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 { struct snd_mixer {
int card; int card;