Module Name: src
Committed By: nat
Date: Mon Apr 3 04:09:12 UTC 2017
Modified Files:
src/sys/dev: audio.c
Log Message:
Exclude mixer channels from channel numbering.
To generate a diff of this commit:
cvs rdiff -u -r1.319 -r1.320 src/sys/dev/audio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/audio.c
diff -u src/sys/dev/audio.c:1.319 src/sys/dev/audio.c:1.320
--- src/sys/dev/audio.c:1.319 Wed Mar 29 06:24:22 2017
+++ src/sys/dev/audio.c Mon Apr 3 04:09:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.319 2017/03/29 06:24:22 nat Exp $ */
+/* $NetBSD: audio.c,v 1.320 2017/04/03 04:09:12 nat Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss <[email protected]>
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.319 2017/03/29 06:24:22 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.320 2017/04/03 04:09:12 nat Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -2088,6 +2088,8 @@ audio_open(dev_t dev, struct audio_softc
SIMPLEQ_FOREACH(chan, &sc->sc_audiochan, entries) {
if (chan == SIMPLEQ_FIRST(&sc->sc_audiochan))
continue;
+ if (chan->chan == MIXER_INUSE)
+ continue;
n = chan->chan + 1;
}
if (n < 0)
