D59199.id185155.diff
No OneTemporary
Actions

Size

793 B

Referenced Files

None

Subscribers

None

D59199.id185155.diff
View Options

	diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
	--- a/sys/dev/sound/usb/uaudio.c
	+++ b/sys/dev/sound/usb/uaudio.c
	@@ -112,6 +112,13 @@
	#define UAUDIO_BUFFER_MS_MIN 1
	#define UAUDIO_BUFFER_MS_MAX 8

	+/*
	+ * The default monitor level is high enough that headsets with a hardware
	+ * sidetone may emit immediate feedback upon attach. We'll lower the default
	+ * just for snd_uaudio(4) to avoid breaking others.
	+ */
	+#define UAUDIO_DEFAULT_MONITOR 10
	+
	static int
	uaudio_buffer_ms_sysctl(SYSCTL_HANDLER_ARGS)
	{
	@@ -1199,6 +1206,8 @@
	}
	if (mixer_init(dev, mixer_class, sc))
	goto detach;
	+ mix_set(sc->sc_child[i].mixer_dev, SOUND_MIXER_MONITOR,
	+ UAUDIO_DEFAULT_MONITOR, UAUDIO_DEFAULT_MONITOR);
	sc->sc_child[i].mixer_init = 1;

	mixer_hwvol_init(dev);