[src/trunk]: src/sys/dev Now that the scope of setting the gain is limited, t...

[nat <nat%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f0ceb2269a79
branches:  trunk
changeset: 824233:f0ceb2269a79
user:      nat <nat%NetBSD.org@localhost>
date:      Sun May 28 21:36:18 2017 +0000

description:
Now that the scope of setting the gain is limited, the hack for /dev/sound
no longer applies.

diffstat:

 sys/dev/audio.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r 9c884184a3fc -r f0ceb2269a79 sys/dev/audio.c
--- a/sys/dev/audio.c   Sun May 28 21:15:58 2017 +0000
+++ b/sys/dev/audio.c   Sun May 28 21:36:18 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.354 2017/05/28 21:12:59 nat Exp $  */
+/*     $NetBSD: audio.c,v 1.355 2017/05/28 21:36:18 nat Exp $  */
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss <nathanialsloss%yahoo.com.au@localhost>
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.354 2017/05/28 21:12:59 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.355 2017/05/28 21:36:18 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -2113,7 +2113,6 @@
        const struct audio_hw_if *hw;
        struct virtual_channel *vc;
        struct audio_chan *chan;
-       struct audio_info info;
 
        KASSERT(mutex_owned(sc->sc_lock));
 
@@ -2240,9 +2239,6 @@
         */
        error = audio_set_defaults(sc, mode, vc);
        if (!error && ISDEVSOUND(dev) && sc->sc_aivalid == true) {
-               error = audiogetinfo(sc, &info, 0, vc);
-               sc->sc_ai.play.gain = info.play.gain;
-               sc->sc_ai.record.gain = info.record.gain;
                sc->sc_ai.mode = mode;
                error = audiosetinfo(sc, &sc->sc_ai, true, vc);
        }