Module Name: src
Committed By: martin
Date: Wed Jun 1 05:47:37 UTC 2022
Modified Files:
src/sys/arch/macppc/dev: snapper.c
Log Message:
In SNAPPER_OUTPUT_SELECT the "mask" is a bitmap of muted outputs, not
active outputs.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/macppc/dev/snapper.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/arch/macppc/dev/snapper.c
diff -u src/sys/arch/macppc/dev/snapper.c:1.62 src/sys/arch/macppc/dev/snapper.c:1.63
--- src/sys/arch/macppc/dev/snapper.c:1.62 Wed Jun 1 05:42:52 2022
+++ src/sys/arch/macppc/dev/snapper.c Wed Jun 1 05:47:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: snapper.c,v 1.62 2022/06/01 05:42:52 martin Exp $ */
+/* $NetBSD: snapper.c,v 1.63 2022/06/01 05:47:37 martin Exp $ */
/* Id: snapper.c,v 1.11 2002/10/31 17:42:13 tsubai Exp */
/* Id: i2s.c,v 1.12 2005/01/15 14:32:35 tsubai Exp */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.62 2022/06/01 05:42:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.63 2022/06/01 05:47:37 martin Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -1274,11 +1274,11 @@ snapper_query_devinfo(void *h, mixer_dev
dip->prev = dip->next = AUDIO_MIXER_LAST;
dip->un.s.num_mem = 3;
strcpy(dip->un.s.member[0].label.name, AudioNspeaker);
- dip->un.s.member[0].mask = 1 << 0;
+ dip->un.s.member[0].mask = (1 << 1)|(1 << 2);
strcpy(dip->un.s.member[1].label.name, AudioNheadphone);
- dip->un.s.member[1].mask = 1 << 1;
+ dip->un.s.member[1].mask = (1 << 0)|(1 << 2);
strcpy(dip->un.s.member[2].label.name, AudioNline);
- dip->un.s.member[2].mask = 1 << 2;
+ dip->un.s.member[2].mask = (1 << 0)|(1 << 1);
return 0;
case SNAPPER_VOL_OUTPUT:
