diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-01-08 18:11:04 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-01-08 18:11:04 +0000 |
| commit | 591fdedd36a7537ebb9bc023cb1a1eb9c4778408 (patch) | |
| tree | 1556f47a9d69a656400fa74b85b8c40979a72edc | |
| parent | 5d1c62e95d4f7c4dacad95ff9ad3989996ae5daa (diff) | |
Don't provide bass and treble mixer controls if the underlying hardware doesn't
provide these. Put them in the outputs class.
ok joris@
| -rw-r--r-- | sys/arch/macppc/dev/i2s.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/sys/arch/macppc/dev/i2s.c b/sys/arch/macppc/dev/i2s.c index e66dd32c817..018e02f17e8 100644 --- a/sys/arch/macppc/dev/i2s.c +++ b/sys/arch/macppc/dev/i2s.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i2s.c,v 1.5 2005/12/11 20:56:01 kettenis Exp $ */ +/* $OpenBSD: i2s.c,v 1.6 2006/01/08 18:11:03 kettenis Exp $ */ /* $NetBSD: i2s.c,v 1.1 2003/12/27 02:19:34 grant Exp $ */ /*- @@ -501,7 +501,6 @@ i2s_halt_input(h) } enum { - I2S_MONITOR_CLASS, I2S_OUTPUT_CLASS, I2S_RECORD_CLASS, I2S_OUTPUT_SELECT, @@ -632,6 +631,7 @@ i2s_query_devinfo(h, dip) void *h; mixer_devinfo_t *dip; { + struct i2s_softc *sc = h; int n = 0; switch (dip->index) { @@ -695,13 +695,6 @@ i2s_query_devinfo(h, dip) sizeof(dip->un.v.units.name)); return 0; - case I2S_MONITOR_CLASS: - dip->mixer_class = I2S_MONITOR_CLASS; - strlcpy(dip->label.name, AudioCmonitor, sizeof(dip->label.name)); - dip->type = AUDIO_MIXER_CLASS; - dip->next = dip->prev = AUDIO_MIXER_LAST; - return 0; - case I2S_OUTPUT_CLASS: dip->mixer_class = I2S_OUTPUT_CLASS; strlcpy(dip->label.name, AudioCoutputs, @@ -718,7 +711,9 @@ i2s_query_devinfo(h, dip) return 0; case I2S_BASS: - dip->mixer_class = I2S_MONITOR_CLASS; + if (sc->sc_setbass == NULL) + return (ENXIO); + dip->mixer_class = I2S_OUTPUT_CLASS; strlcpy(dip->label.name, AudioNbass, sizeof(dip->label.name)); dip->type = AUDIO_MIXER_VALUE; dip->prev = dip->next = AUDIO_MIXER_LAST; @@ -726,13 +721,14 @@ i2s_query_devinfo(h, dip) return (0); case I2S_TREBLE: - dip->mixer_class = I2S_MONITOR_CLASS; + if (sc->sc_settreble == NULL) + return (ENXIO); + dip->mixer_class = I2S_OUTPUT_CLASS; strlcpy(dip->label.name, AudioNtreble, sizeof(dip->label.name)); dip->type = AUDIO_MIXER_VALUE; dip->prev = dip->next = AUDIO_MIXER_LAST; dip->un.v.num_channels = 1; return (0); - } return ENXIO; |