diff options
| author | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2008-12-23 08:57:29 +0000 |
|---|---|---|
| committer | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2008-12-23 08:57:29 +0000 |
| commit | 9f8edaac229c268d86391b4ea497057bce12a982 (patch) | |
| tree | 16e0798938390fad1ed647788225e8a5da2c0666 | |
| parent | 9e76167406c6d96615d6e23f7cf5ff78800fb554 (diff) | |
line-in is now "line-in", line-out is still "line". S/PDIF-out is
now "SPDIF", S/PDIF-in is still "SPDIF-in".
line change because we need to differentiate. S/PDIF change because
SPDIF-out is too long, and for consistency.
| -rw-r--r-- | sys/dev/pci/azalia.c | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c index 562ddbf683c..c9a4df5634e 100644 --- a/sys/dev/pci/azalia.c +++ b/sys/dev/pci/azalia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.c,v 1.91 2008/12/23 04:12:19 jakemsr Exp $ */ +/* $OpenBSD: azalia.c,v 1.92 2008/12/23 08:57:28 jakemsr Exp $ */ /* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */ /*- @@ -329,8 +329,8 @@ struct audio_hw_if azalia_hw_if = { static const char *pin_devices[16] = { AudioNline, AudioNspeaker, AudioNheadphone, AudioNcd, - "SPDIF-out", "digital-out", "modem-line", "modem-handset", - AudioNline, AudioNaux, AudioNmicrophone, "telephony", + "SPDIF", "digital-out", "modem-line", "modem-handset", + "line-in", AudioNaux, AudioNmicrophone, "telephony", "SPDIF-in", "digital-in", "beep", "other"}; static const char *wtypes[16] = { "dac", "adc", "mix", "sel", "pin", "pow", "volume", @@ -1774,24 +1774,13 @@ azalia_widget_label_widgets(codec_t *codec) switch (w->type) { case COP_AWTYPE_PIN_COMPLEX: pins[w->d.pin.device]++; - if (w->d.pin.device == CORB_CD_LINEIN) { - pins[CORB_CD_LINEOUT]++; - if (pins[CORB_CD_LINEOUT] > 1) - snprintf(w->name, sizeof(w->name), "%s%d", - pin_devices[CORB_CD_LINEOUT], - pins[CORB_CD_LINEOUT]); - else - snprintf(w->name, sizeof(w->name), "%s", - pin_devices[CORB_CD_LINEOUT]); - } else { - if (pins[w->d.pin.device] > 1) - snprintf(w->name, sizeof(w->name), "%s%d", - pin_devices[w->d.pin.device], - pins[w->d.pin.device]); - else - snprintf(w->name, sizeof(w->name), "%s", - pin_devices[w->d.pin.device]); - } + if (pins[w->d.pin.device] > 1) + snprintf(w->name, sizeof(w->name), "%s%d", + pin_devices[w->d.pin.device], + pins[w->d.pin.device]); + else + snprintf(w->name, sizeof(w->name), "%s", + pin_devices[w->d.pin.device]); break; case COP_AWTYPE_AUDIO_OUTPUT: if (codec->dacs.ngroups < 1) |