diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2008-01-16 08:32:08 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:30:00 +0100 |
| commit | ccc80fb467a88ceb7ce1b68546632b91e5ba6c18 (patch) | |
| tree | 097f13a250fa155faeacc1fb127a000cc19ebbb6 /sound/pci/oxygen/oxygen_mixer.c | |
| parent | e85e09250ab552fab6925bcde7c77746101b2d40 (diff) | |
| download | kernel_samsung_smdk4412-ccc80fb467a88ceb7ce1b68546632b91e5ba6c18.zip kernel_samsung_smdk4412-ccc80fb467a88ceb7ce1b68546632b91e5ba6c18.tar.gz kernel_samsung_smdk4412-ccc80fb467a88ceb7ce1b68546632b91e5ba6c18.tar.bz2 | |
[ALSA] oxygen: add control filter to model struct
Allow the models to modify mixer controls before they are added to the
card.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/oxygen/oxygen_mixer.c')
| -rw-r--r-- | sound/pci/oxygen/oxygen_mixer.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index 8b08e6d..fae7c0f 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c @@ -27,11 +27,9 @@ static int dac_volume_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info) { - struct oxygen *chip = ctl->private_data; - info->type = SNDRV_CTL_ELEM_TYPE_INTEGER; info->count = 8; - info->value.integer.min = chip->model->dac_minimum_volume; + info->value.integer.min = 0; info->value.integer.max = 0xff; return 0; } @@ -525,14 +523,10 @@ static const struct snd_kcontrol_new controls[] = { { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Master Playback Volume", - .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | - SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, .info = dac_volume_info, .get = dac_volume_get, .put = dac_volume_put, - .tlv = { - .p = NULL, /* set later */ - }, }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, @@ -635,18 +629,18 @@ static int add_controls(struct oxygen *chip, [CONTROL_AUX_CAPTURE_SWITCH] = "Aux Capture Switch", }; unsigned int i, j; + struct snd_kcontrol_new template; struct snd_kcontrol *ctl; int err; for (i = 0; i < count; ++i) { + template = controls[i]; + err = chip->model->control_filter(&template); + if (err < 0) + return err; ctl = snd_ctl_new1(&controls[i], chip); if (!ctl) return -ENOMEM; - if (!strcmp(ctl->id.name, "Master Playback Volume")) - ctl->tlv.p = chip->model->dac_tlv; - else if (chip->model->cd_in_from_video_in && - !strncmp(ctl->id.name, "CD Capture ", 11)) - ctl->private_value ^= AC97_CD ^ AC97_VIDEO; err = snd_ctl_add(chip->card, ctl); if (err < 0) return err; |