|
@@ -55,20 +55,13 @@
|
|
|
static int snd_msndmix_info_mux(struct snd_kcontrol *kcontrol,
|
|
|
struct snd_ctl_elem_info *uinfo)
|
|
|
{
|
|
|
- static char *texts[3] = {
|
|
|
+ static const char * const texts[3] = {
|
|
|
"Analog", "MASS", "SPDIF",
|
|
|
};
|
|
|
struct snd_msnd *chip = snd_kcontrol_chip(kcontrol);
|
|
|
unsigned items = test_bit(F_HAVEDIGITAL, &chip->flags) ? 3 : 2;
|
|
|
|
|
|
- uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
|
|
|
- uinfo->count = 1;
|
|
|
- uinfo->value.enumerated.items = items;
|
|
|
- if (uinfo->value.enumerated.item >= items)
|
|
|
- uinfo->value.enumerated.item = items - 1;
|
|
|
- strcpy(uinfo->value.enumerated.name,
|
|
|
- texts[uinfo->value.enumerated.item]);
|
|
|
- return 0;
|
|
|
+ return snd_ctl_enum_info(uinfo, 1, items, texts);
|
|
|
}
|
|
|
|
|
|
static int snd_msndmix_get_mux(struct snd_kcontrol *kcontrol,
|