26c26
< * $FreeBSD: head/sys/dev/sound/pcm/mixer.c 70680 2001-01-05 07:07:03Z jhb $
---
> * $FreeBSD: head/sys/dev/sound/pcm/mixer.c 70944 2001-01-11 23:26:16Z jhb $
285c285
< else
---
> else if (dev != m->hwvol_mixer) {
286a287,288
> m->hwvol_muted = 0;
> }
292c294
< mixer_hwinit(device_t dev)
---
> mixer_hwvol_init(device_t dev)
310c312
< mixer_hwmute(device_t dev)
---
> mixer_hwvol_mute(device_t dev)
317,319c319,321
< if (m->muted) {
< m->muted = 0;
< mixer_set(m, m->hwvol_mixer, m->mute_level);
---
> if (m->hwvol_muted) {
> m->hwvol_muted = 0;
> mixer_set(m, m->hwvol_mixer, m->hwvol_mute_level);
321,322c323,324
< m->muted++;
< m->mute_level = mixer_get(m, m->hwvol_mixer);
---
> m->hwvol_muted++;
> m->hwvol_mute_level = mixer_get(m, m->hwvol_mixer);
328c330
< mixer_hwstep(device_t dev, int left_step, int right_step)
---
> mixer_hwvol_step(device_t dev, int left_step, int right_step)
336c338,342
< level = mixer_get(m, m->hwvol_mixer);
---
> if (m->hwvol_muted) {
> m->hwvol_muted = 0;
> level = m->hwvol_mute_level;
> } else
> level = mixer_get(m, m->hwvol_mixer);