From 62a5715c0af49b62b331c2538025a8ab5ce6c6e5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 5 Aug 2024 11:23:15 +0200 Subject: Merging upstream version 7.0.20-dfsg. Signed-off-by: Daniel Baumann --- src/VBox/Devices/Config.kmk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/VBox/Devices/Config.kmk') diff --git a/src/VBox/Devices/Config.kmk b/src/VBox/Devices/Config.kmk index f24024f8..335a83eb 100644 --- a/src/VBox/Devices/Config.kmk +++ b/src/VBox/Devices/Config.kmk @@ -112,7 +112,7 @@ TEMPLATE_VBoxBios32Lib_POST_CMDS = $(NO_SUCH_VARIABLE) # VBOX_AUDIO_DEFS := if 0 # Not stable yet. - # Enable microphone-in support for HDA. Otherwise only line-in is supported. + # Enable dedicated microphone-in support for HDA. Otherwise only line-in is supported. VBOX_AUDIO_DEFS += VBOX_WITH_AUDIO_HDA_MIC_IN # Enable interleavig streams support for HDA. Needed for 5.1 surround support. @@ -123,6 +123,16 @@ if 0 # Not stable yet. VBOX_AUDIO_DEFS += VBOX_WITH_AUDIO_HDA_51_SURROUND endif +# If dedicated microphone-in support for HDA isn't enabled, treat mic-in as line-in to +# propagate the volume (+ mute) settings appropriately. +ifndef VBOX_WITH_AUDIO_HDA_MIC_IN + VBOX_AUDIO_DEFS += VBOX_AUDIO_HDA_MIC_IN_AS_LINE_IN +endif + +if defined(VBOX_WITH_AUDIO_HDA_MIC_IN) && defined(VBOX_AUDIO_HDA_MIC_IN_AS_LINE_IN) + $(error Defining VBOX_WITH_AUDIO_HDA_MIC_IN and VBOX_AUDIO_HDA_MIC_IN_AS_LINE_IN at the same time makes no sense!) +endif + # Enable backend-independent device enumeration support. VBOX_AUDIO_DEFS += VBOX_WITH_AUDIO_ENUM -- cgit v1.2.3