diff options
| author | Deanna Phillips <deanna@cvs.openbsd.org> | 2007-12-16 18:48:20 +0000 |
|---|---|---|
| committer | Deanna Phillips <deanna@cvs.openbsd.org> | 2007-12-16 18:48:20 +0000 |
| commit | 1225b03844bb16de48ce13ea03bf9ad41380eef1 (patch) | |
| tree | 1691bfeb6af15090685147cf7e7ba16ef1d56a91 /sys/dev/pci | |
| parent | ffb9333722834207ee4124d9f74204b94825b777 (diff) | |
Put inamp gain and inamp mute controls under AudioCinputs. This
avoids some duplicate items when a pin widget has both input and
output amplifiers.
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/azalia_codec.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/sys/dev/pci/azalia_codec.c b/sys/dev/pci/azalia_codec.c index 6653c8ca59f..3da52f8868e 100644 --- a/sys/dev/pci/azalia_codec.c +++ b/sys/dev/pci/azalia_codec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia_codec.c,v 1.45 2007/12/06 19:58:48 deanna Exp $ */ +/* $OpenBSD: azalia_codec.c,v 1.46 2007/12/16 18:48:19 deanna Exp $ */ /* $NetBSD: azalia_codec.c,v 1.8 2006/05/10 11:17:27 kent Exp $ */ /*- @@ -529,9 +529,7 @@ azalia_generic_mixer_init(codec_t *this) snprintf(d->label.name, sizeof(d->label.name), "%s.mute", w->name); d->type = AUDIO_MIXER_ENUM; - if (w->type == COP_AWTYPE_PIN_COMPLEX) - d->mixer_class = AZ_CLASS_OUTPUT; - else if (w->type == COP_AWTYPE_AUDIO_INPUT) + if (w->type == COP_AWTYPE_AUDIO_INPUT) d->mixer_class = AZ_CLASS_RECORD; else d->mixer_class = AZ_CLASS_INPUT; @@ -553,9 +551,7 @@ azalia_generic_mixer_init(codec_t *this) "%s.%s.mute", w->name, this->w[w->connections[j]].name); d->type = AUDIO_MIXER_ENUM; - if (w->type == COP_AWTYPE_PIN_COMPLEX) - d->mixer_class = AZ_CLASS_OUTPUT; - else if (w->type == COP_AWTYPE_AUDIO_INPUT) + if (w->type == COP_AWTYPE_AUDIO_INPUT) d->mixer_class = AZ_CLASS_RECORD; else d->mixer_class = AZ_CLASS_INPUT; @@ -581,9 +577,7 @@ azalia_generic_mixer_init(codec_t *this) snprintf(d->label.name, sizeof(d->label.name), "%s", w->name); d->type = AUDIO_MIXER_VALUE; - if (w->type == COP_AWTYPE_PIN_COMPLEX) - d->mixer_class = AZ_CLASS_OUTPUT; - else if (w->type == COP_AWTYPE_AUDIO_INPUT) + if (w->type == COP_AWTYPE_AUDIO_INPUT) d->mixer_class = AZ_CLASS_RECORD; else d->mixer_class = AZ_CLASS_INPUT; @@ -608,9 +602,7 @@ azalia_generic_mixer_init(codec_t *this) "%s.%s", w->name, this->w[w->connections[j]].name); d->type = AUDIO_MIXER_VALUE; - if (w->type == COP_AWTYPE_PIN_COMPLEX) - d->mixer_class = AZ_CLASS_OUTPUT; - else if (w->type == COP_AWTYPE_AUDIO_INPUT) + if (w->type == COP_AWTYPE_AUDIO_INPUT) d->mixer_class = AZ_CLASS_RECORD; else d->mixer_class = AZ_CLASS_INPUT; |